From 9585a16c9668f8aacba7ce72d5061fc38c4745e0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 4 Jan 2017 09:26:32 +0200 Subject: libgbm: make possible to use other libgbm provides than mesa Mesa is the default libgbm provider, but does not yet have virtual/libgbm in the PROVIDES list. This makes it difficult the change the dependency to another recipes that provide only libgbm. Add virtual/libgbm to mesa and TI's libgbm recipe, and change the dependency in qtbase. Add gbm to qtbase PACKAGECONFIG on intel devices. Task-number: QTBUG-57896 Change-Id: I491df7057e52f9e74dd87abf65e542eab2cd3f9e Reviewed-by: Gatis Paeglis Reviewed-by: Mikko Gronoff --- .../recipes/recipes-qt/qtbase_git.bbappend | 2 +- meta-ti-extras/recipes/gbm/libgbm_%.bbappend | 30 ++++++++++++++++++++++ recipes-qt/qt5/qtbase_git.bbappend | 3 +++ recipes/mesa/mesa_%.bbappend | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-ti-extras/recipes/gbm/libgbm_%.bbappend diff --git a/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend index 8770c65..602782e 100644 --- a/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend +++ b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -PACKAGECONFIG += "kms" +PACKAGECONFIG += "gbm kms" diff --git a/meta-ti-extras/recipes/gbm/libgbm_%.bbappend b/meta-ti-extras/recipes/gbm/libgbm_%.bbappend new file mode 100644 index 0000000..fd11a50 --- /dev/null +++ b/meta-ti-extras/recipes/gbm/libgbm_%.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +PROVIDES += "virtual/libgbm" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 585e1b5..e997936 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -58,3 +58,6 @@ do_configure_prepend() { } SRCREV = "179045f36a16ce2f6cfaad1dbd9443b52b1bf8d3" + +# make other libgbm providers possible +PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/libgbm" diff --git a/recipes/mesa/mesa_%.bbappend b/recipes/mesa/mesa_%.bbappend index fc55a18..35f66f4 100644 --- a/recipes/mesa/mesa_%.bbappend +++ b/recipes/mesa/mesa_%.bbappend @@ -28,3 +28,4 @@ ############################################################################ RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev" +PROVIDES += "virtual/libgbm" -- cgit v1.2.3-54-g00ecf