From patchwork Thu Jan 11 18:07:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 859225 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b="PCAfgrVT"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zHYkN5sXbz9ryQ for ; Fri, 12 Jan 2018 05:07:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C64B08A315; Thu, 11 Jan 2018 18:07:17 +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 VkaMmXDhC1q0; Thu, 11 Jan 2018 18:07:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6E1778A304; Thu, 11 Jan 2018 18:07:15 +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 EC5D81C16D8 for ; Thu, 11 Jan 2018 18:07:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E8D3789134 for ; Thu, 11 Jan 2018 18:07: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 VaC4YGesm2g2 for ; Thu, 11 Jan 2018 18:07:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 176CB8911D for ; Thu, 11 Jan 2018 18:07:13 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id b141so7332971wme.1 for ; Thu, 11 Jan 2018 10:07:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=gCSsZZNFcPuxO/vumLKOEQoSDIl7GemoU871YtYjzrM=; b=PCAfgrVT+y4B4ChwDzhoL+k1447VkCzXwdvrdK7QaigmBV31xFHYn7iLqF8nmOcb9z 1hdiK9Wlv+a5XT0KAbOStGGeZPdagJU1LIvfbdVryExOCtaaZ2L5D5ddFMeyNiG4ZsZA 6w0o2uOSjmW3EubhAx7Xf6pzWSPftY5BSiITBKh+QArBylp8175beMUm3qLV5L4A9XSi UWGK73yOOXW39R/EdRrQMtC2wxNrFgpSoABtjS4y7ssfPAXOArv0M3L+M54/1Bri3XBk B3ry8/QALCOOpElywnYJy1CUrfUfaONHW6VyPAirdZpY2UPtPgsnWp8awEZ0WB5NcJh2 DXKA== 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; bh=gCSsZZNFcPuxO/vumLKOEQoSDIl7GemoU871YtYjzrM=; b=KNQAvV3DyXmuzEJ+4IOmyw3Gj9nqZimvNvftPzClmWrkr1WVffi7lRb8miiW9aucrv QhjlBzgQZPqHF6rOwAotBZ0qkJmBoU2BpVPYb0HTTjMD7c1wGEXBk8QO1EaNAu5kApA7 geX8EUQGpzrcAkdGKTRiTgn9tMmx4bOA0X2SvXmfZoCq8vKzoa0mGnJfs9CdU6jyeJKQ NdtgVvJpbSzpMsKMOi9djvmPpiTRewhaPmrswkZWOSyAh/+eWsFF5JyT0Tx+4cLt4G9O DpL2XTv29S50t55MpsnwLcOnVYggQSO/yvn4Nryi06zD3jFmyeDopwLzjAmGDuRgf7+4 AYXQ== X-Gm-Message-State: AKwxytelZdrpSx7rjYKkGnmz/+8Efumdfsr5ijtyA05raSfAaUv7Pmjp EkgJ/c3j0beTBtBhppyioC7ge9Gw X-Google-Smtp-Source: ACJfBosI4v5bnOZ8a25geQRa1Q0KemBPTLuf+OIOkUlAdT+ePMAoXdjsU0E3tB9XfR9S2UtSBQA4Lg== X-Received: by 10.28.17.76 with SMTP id 73mr2016950wmr.104.1515694031434; Thu, 11 Jan 2018 10:07:11 -0800 (PST) Received: from t450s.lan (89-92-157-126.hfc.dyn.abo.bbox.fr. [89.92.157.126]) by smtp.googlemail.com with ESMTPSA id a62sm1218554wmh.3.2018.01.11.10.07.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 10:07:10 -0800 (PST) From: Gary Bisson To: buildroot@buildroot.org Date: Thu, 11 Jan 2018 19:07:02 +0100 Message-Id: <20180111180702.20687-1-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.15.1 Subject: [Buildroot] [PATCH] imx-gpu-viv: fix compiling issues with EGL_API_FB X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Just like the previous commit did: c9ecdd2b96 gpu-viv-bin-mx6q: fix compiling issues with EGL_API_FB Difference is that in latest package, eglvivante.h is included after a EGL_API_FB check in eglplatform.h, giving the following error: /.../sysroot/usr/include/EGL/eglplatform.h:146:10: fatal error: X11/Xlib.h: No such file or directory #include Also, this patch introduce IMX_GPU_VIV_FIXUP_PKGCONFIG which fixes the pkgconfig files (for some reason default egl.pc file isn't the same as the one for fb target). Finally, this patch removes references to libVIVANTE which is now replaced by libVDK. Signed-off-by: Gary Bisson --- Hi, This patch is required to build Qt5 with latest Vivante libraries. Let me know if you'd rather have me split this into 3 patches (1 to fix the header, 1 to fix pkgconfig, 1 to remove libVIVANTE). Regards, Gary --- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 5d3d9c671b..a9f8b9d9bd 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -43,7 +43,6 @@ define IMX_GPU_VIV_BUILD_CMDS ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2 ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0 - ln -sf libVIVANTE-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVIVANTE.so ln -sf libGAL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so ln -sf libVDK-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVDK.so endef @@ -53,14 +52,29 @@ define IMX_GPU_VIV_FIXUP_FB_HEADERS $(SED) '39i\ #if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\ #define EGL_API_FB \n\ - #endif' $(STAGING_DIR)/usr/include/EGL/eglvivante.h + #endif' $(STAGING_DIR)/usr/include/EGL/eglplatform.h +endef +endif + +ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) +define IMX_GPU_VIV_FIXUP_PKGCONFIG + ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc +endef +endif + +ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) +define IMX_GPU_VIV_FIXUP_PKGCONFIG + for lib in egl gbm glesv1_cm glesv2 vg; do \ + ln -sf $${lib}_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc + done endef endif define IMX_GPU_VIV_INSTALL_STAGING_CMDS cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr $(IMX_GPU_VIV_FIXUP_FB_HEADERS) - for lib in egl glesv2 vg; do \ + $(IMX_GPU_VIV_FIXUP_PKGCONFIG) + for lib in egl gbm glesv1_cm glesv2 vg; do \ $(INSTALL) -m 0644 -D \ $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \ @@ -87,7 +101,7 @@ define IMX_GPU_VIV_INSTALL_TARGET_CMDS $(IMX_GPU_VIV_INSTALL_EXAMPLES) $(IMX_GPU_VIV_INSTALL_GMEM_INFO) cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr - for lib in EGL GAL VIVANTE GLESv2 VDK; do \ + for lib in EGL GAL GLESv2 VDK; do \ for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \ case $$f in \ *-$(IMX_GPU_VIV_LIB_TARGET).so) : ;; \