From b94732da58230d8fbbcf4103de1a82e8e4a9e857 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 8 Oct 2018 12:39:01 +0300 Subject: qtbase, mesa: remove gbm related bbappends changes available in upstream: meta-qt5: 75e2d3a2e3888c06c1da74f3f6ab82882f450064 poky: 39e0d1f0e4e3afe8e7032bb462d21f2e6f8b714e 8be26d5833cea0d221d85a3502bbc11641209701 Change-Id: Ibb3c96ce60e79272fd3a273db772bd3940dc7551 Reviewed-by: Samuli Piippo --- .../recipes-graphics/mesa/mesa_%.bbappend | 31 ---------------------- .../recipes-qt/qt5/qtbase_git.bbappend | 3 --- 2 files changed, 34 deletions(-) delete mode 100644 meta-boot2qt-distro/recipes-graphics/mesa/mesa_%.bbappend diff --git a/meta-boot2qt-distro/recipes-graphics/mesa/mesa_%.bbappend b/meta-boot2qt-distro/recipes-graphics/mesa/mesa_%.bbappend deleted file mode 100644 index 35f66f4..0000000 --- a/meta-boot2qt-distro/recipes-graphics/mesa/mesa_%.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 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$ -## -############################################################################ - -RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev" -PROVIDES += "virtual/libgbm" diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend index 0e4089b..d2987a7 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend @@ -65,6 +65,3 @@ SRC_URI += " \ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } - -# make other libgbm providers possible -PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/libgbm" -- cgit v1.2.3-54-g00ecf