From patchwork Thu Jan 7 11:04:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1423250 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.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.a=rsa-sha256 header.s=20161025 header.b=geqzH1bZ; 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 4DBNg84sdKz9sWS for ; Thu, 7 Jan 2021 22:05:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C5FF1868DE; Thu, 7 Jan 2021 11:05:06 +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 y55O6lVfoAhO; Thu, 7 Jan 2021 11:05:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 4C2DC86A95; Thu, 7 Jan 2021 11:05:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C9B361BF41A for ; Thu, 7 Jan 2021 11:04:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B490F204B7 for ; Thu, 7 Jan 2021 11:04:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sZ-3pkW8zs3p for ; Thu, 7 Jan 2021 11:04:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by silver.osuosl.org (Postfix) with ESMTPS id 482BC204AF for ; Thu, 7 Jan 2021 11:04:55 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id w5so5185352wrm.11 for ; Thu, 07 Jan 2021 03:04:55 -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=Las566k3bbCU2/WGW4gLpZKxZMriVIAFC8RdpoAqBZ4=; b=geqzH1bZlMspbOnzTNsLeGLctEKjv8cuzGMJfPHLX6vbfdZ3Hka1s0oQo9mpLPkxL0 IBuIXErvaiK4z+dbkGRm11BfjF1CnpOJ7Cito1l7h8EqYzwpYyVH2bV0xQJItA6DEtJR 2ltsG9AatNEArF4Bj5q/q3y6LO39W1P54pIw79gxp6HnHcTsr4sfDvPnZVz9akwuBsGC lOdJWfTgH+c6STAo/L/oJwrbtHbqfjmuvjLWXyQjLvWVyAxNGpUyzu00pNWKd5s52rTr 4E7T/rfsMNR38hcKVc4uiu9YyVSklmkKt+dd/SwRpVBcqyuVrIw1by3W38p4y8525xyj aNDA== 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=Las566k3bbCU2/WGW4gLpZKxZMriVIAFC8RdpoAqBZ4=; b=ko7+24TvL5ykw8uTW2AiNftiQB3X5pSvRs+1x5FTUKQuKrJYgBiu/FvgOE2ieGyRTe wDXaHfSmK7/nqCaf2HtYQnjMKBItgzfMW4CH/uEcIBlgQyHQhV0HPngVhjwyvpr8s324 wVjNU7BvanKJa8mDn2C50fYEumLREOV4hC8NvmElmv45zPPRHe3dDuWgpAFdrKLQOKkN nmsavJcTE+CHwhpq1iFH6x+33hUBWAQRvdUlj36SXpkPosRUWZw9bMnVUyc0VmL9LF0n jhO+m/lIIREBzv7cJJQCabPHSghYfP1eDH4u5hCeMeN1oeJjqINvmMmHfzNjjPvRKk4O LgvQ== X-Gm-Message-State: AOAM533TeElkm6z2THGIX0RG+X8qdDzOXgbMOj6karGvnfeGt09b1HTS GFK8LVystPxRxnN/YRhwlEMpMTgsQik= X-Google-Smtp-Source: ABdhPJzs8Li5XHNg1MigdQnbmGQqTjik5PEAWEKNhfGjUu1FEQlnqep0VsG7tvMg26kzyNbdEswEOw== X-Received: by 2002:adf:8342:: with SMTP id 60mr8589174wrd.140.1610017493703; Thu, 07 Jan 2021 03:04:53 -0800 (PST) Received: from atlas.home (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id u83sm7475674wmu.12.2021.01.07.03.04.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 03:04:53 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Thu, 7 Jan 2021 12:04:47 +0100 Message-Id: <20210107110450.4031102-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Subject: [Buildroot] [RFC: 1/4] package/freescale-imx/imx-gpu-viv: BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_{X11, WL} are libgl provider 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 , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" libGL.so is installed when BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 or BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL is selected, so declare it as a libgl provider. Signed-off-by: Romain Naour Cc: Gary Bisson --- Not related to this patch but mesa3d-demo doesn't build with imx-gpu-viv as GL provider. meta-freescale provide a patch that replace glWindowPos2iARB calls with glWindowPos2i but it was rejected by upstream. https://github.com/Freescale/meta-freescale/blob/dunfell/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch --- package/freescale-imx/imx-gpu-viv/Config.in | 6 ++++++ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index cca2689905..4e53044d1d 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -44,6 +44,7 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXFIXES + select BR2_PACKAGE_HAS_LIBGL # libGL-x11.so comment "X11 backend needs Xorg package" depends on !BR2_PACKAGE_XORG7 @@ -60,6 +61,7 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_HAS_LIBGL # libGL-wl.so endchoice @@ -72,6 +74,10 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT config BR2_PACKAGE_PROVIDES_LIBEGL default "imx-gpu-viv" +config BR2_PACKAGE_PROVIDES_LIBGL + default "imx-gpu-viv" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 || \ + BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL + config BR2_PACKAGE_PROVIDES_LIBGLES default "imx-gpu-viv" 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 6ae9aa7acc..f03415b336 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -61,7 +61,7 @@ endif ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) define IMX_GPU_VIV_FIXUP_PKGCONFIG - for lib in egl gbm glesv1_cm glesv2 vg; do \ + for lib in egl gbm glesv1_cm glesv2 gl vg; do \ ln -sf $${lib}_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc || exit 1; \ done endef @@ -70,7 +70,7 @@ endif define IMX_GPU_VIV_INSTALL_STAGING_CMDS cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr $(IMX_GPU_VIV_FIXUP_PKGCONFIG) - for lib in egl gbm glesv1_cm glesv2 vg; do \ + for lib in egl gbm glesv1_cm glesv2 gl vg; do \ $(INSTALL) -m 0644 -D \ $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \