From patchwork Sun May 17 20:40:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Skrzypnik X-Patchwork-Id: 1292259 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=none (p=none dis=none) header.from=novomatic-tech.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=novomatic-tech.com header.i=@novomatic-tech.com header.a=rsa-sha256 header.s=ntpgsuite header.b=YFGi/329; 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 49QDXy472Gz9sT6 for ; Mon, 18 May 2020 06:40:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1093A87CB8; Sun, 17 May 2020 20:40:01 +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 1TTWgNhjSrOf; Sun, 17 May 2020 20:39:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 09BC687CA2; Sun, 17 May 2020 20:39:59 +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 38DE81BF3F7 for ; Sun, 17 May 2020 20:39:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2FA0B2052A for ; Sun, 17 May 2020 20:39:53 +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 Kj2QW4YmT8hG for ; Sun, 17 May 2020 20:39:51 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by silver.osuosl.org (Postfix) with ESMTPS id DB7D320531 for ; Sun, 17 May 2020 20:39:49 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id k13so7380434wrx.3 for ; Sun, 17 May 2020 13:39:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=novomatic-tech.com; s=ntpgsuite; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hznDvE1CMULaramvz5MKMj1vZyXnA7MZdoJ52Xbx6J0=; b=YFGi/329MX6vd7+zdgCXnzJDPJOb7E8kToRVQc1A5JOYKEZ68U1hfeapGUKJNDX2ip UIIf6a+7f2k/Op0lng1Ql6t0dr8HmGPDsKNvDGzEaQ6nUr2mb4KNykf/yDNtcFDE8S4+ JnoYDxgWmNl4DmzkFYkh8jvfBPRZwYV2SfAhNJYdubsIUDV11lurdLkEnn1uRo/qUVMJ 9vcaH2F4t6dBYBZ5aFC2TILwnDzL4iI++PhXQlq8xC1084U9iKGpWa6so/ug8lYxbQLa fONHnlchBYb5Y2JwVETwLvd7yqM5ldcc/ZrMFcUD/A2AFnvgJ+wfCVd9dKhvnPpmaydQ 2lxg== 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:mime-version:content-transfer-encoding; bh=hznDvE1CMULaramvz5MKMj1vZyXnA7MZdoJ52Xbx6J0=; b=g8wRMVdUeD7GZWiNEspXfJi2PueeybzgLuQcA/UMknxQ1EvwDFjDh+1QCPhAG1GadD gFt1lepIpQUzfIEe8+yqj5y/aOEAKddSSIf8jymOunVS6viavKnl5gJCF6cKFgjvrBim Vk3UPdbcaxyrL6oMgJ+K/Cxv46GL+xkdpY4diw7b5YpcGZDYY4+qX+4sJAKwxrx9/kGV 159b3OMCIYjW0mV7QaNqKG7fsJaZkCgyCjyDt20wEgTAfYqT0zlR8RW2Rw2piwm3TIxn h+FCFDaqgenYFE8wm/N55GY0n1Ig99I3z9JUoDS+HIIWe+izKfExXZ7wiZyieB13ffRN LJNg== X-Gm-Message-State: AOAM531HpGWFD9IdDafautBVUuA9Mw0gn1ODbLwLv6GWjEjeTYRIxUHA gJXJzWgNTpxS3/YCGLIE5YkvyRDlGDaoZOhTggpaA2TllbgJLJVQZzK18L7L+a6gbIhxs6kM2eG iU9umpMqo7+34F3YfdR3Qzw== X-Google-Smtp-Source: ABdhPJzdKTTZxkUlrjd7WxD7eUCHvYznARqsNRPqWOHFIj6F5JLzLiYnogMn+4S/79LusjFJ7bD6Jg== X-Received: by 2002:adf:8041:: with SMTP id 59mr15215897wrk.278.1589747988142; Sun, 17 May 2020 13:39:48 -0700 (PDT) Received: from localhost.localdomain (iron.skrzyp.net. [89.163.146.176]) by smtp.gmail.com with ESMTPSA id c143sm11861953wmd.43.2020.05.17.13.39.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 13:39:47 -0700 (PDT) From: Jakub Skrzypnik To: buildroot@buildroot.org Date: Sun, 17 May 2020 22:40:01 +0200 Message-Id: <20200517204003.2187318-3-jskrzypnik@novomatic-tech.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517204003.2187318-1-jskrzypnik@novomatic-tech.com> References: <20200512132859.15189-1-jskrzypnik@novomatic-tech.com> <20200517204003.2187318-1-jskrzypnik@novomatic-tech.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/4] package/mesa3d: make it aware of libglvnd and support it when present 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: Bernd Kuhls , Romain Naour , Jakub Skrzypnik , "Yann E . MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Jakub Skrzypnik --- package/mesa3d/Config.in | 2 ++ package/mesa3d/mesa3d.mk | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index dd512d9b76..9b3f1546c8 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -442,6 +442,7 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES endif # BR2_PACKAGE_MESA3D_DRIVER +if !BR2_PACKAGE_LIBGLVND config BR2_PACKAGE_PROVIDES_LIBGL default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX @@ -450,6 +451,7 @@ config BR2_PACKAGE_PROVIDES_LIBEGL config BR2_PACKAGE_PROVIDES_LIBGLES default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES +endif config BR2_PACKAGE_PROVIDES_LIBOPENCL default "mesa3d" if BR2_PACKAGE_MESA3D_OPENCL diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d1933dabfd..da21870431 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -50,6 +50,8 @@ ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) MESA3D_DEPENDENCIES += elfutils endif + + ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # Disable-mangling not yet supported by meson build system. # glx: @@ -275,4 +277,11 @@ else MESA3D_CONF_OPTS += -Dzstd=false endif +ifeq ($(BR2_PACKAGE_LIBGLVND),y) +MESA3D_DEPENDENCIES += libglvnd +MESA3D_CONF_OPTS += -Dglvnd=true +MESA3D_WITH_GLVND_PROVIDES = $(filter-out libgl libegl libgles,$(MESA3D_PROVIDES)) +MESA3D_PROVIDES := $(MESA3D_WITH_GLVND_PROVIDES) +endif + $(eval $(meson-package))