diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-08 12:39:01 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-09 12:37:38 +0000 |
| commit | b94732da58230d8fbbcf4103de1a82e8e4a9e857 (patch) | |
| tree | 85fe5109bac9360aa77144a030f9f75faa67c7ec /meta-boot2qt-distro | |
| parent | da675dd18a83d4ce56a46be9961738e471aa5c03 (diff) | |
| download | meta-boot2qt-b94732da58230d8fbbcf4103de1a82e8e4a9e857.tar.gz | |
qtbase, mesa: remove gbm related bbappends
changes available in upstream:
meta-qt5:
75e2d3a2e3888c06c1da74f3f6ab82882f450064
poky:
39e0d1f0e4e3afe8e7032bb462d21f2e6f8b714e
8be26d5833cea0d221d85a3502bbc11641209701
Change-Id: Ibb3c96ce60e79272fd3a273db772bd3940dc7551
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-boot2qt-distro')
| -rw-r--r-- | meta-boot2qt-distro/recipes-graphics/mesa/mesa_%.bbappend | 31 | ||||
| -rw-r--r-- | meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend | 3 |
2 files changed, 0 insertions, 34 deletions
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 @@ | |||
| 1 | ############################################################################ | ||
| 2 | ## | ||
| 3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
| 4 | ## Contact: https://www.qt.io/licensing/ | ||
| 5 | ## | ||
| 6 | ## This file is part of the Boot to Qt meta layer. | ||
| 7 | ## | ||
| 8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
| 9 | ## Commercial License Usage | ||
| 10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
| 11 | ## accordance with the commercial license agreement provided with the | ||
| 12 | ## Software or, alternatively, in accordance with the terms contained in | ||
| 13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
| 14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
| 15 | ## information use the contact form at https://www.qt.io/contact-us. | ||
| 16 | ## | ||
| 17 | ## GNU General Public License Usage | ||
| 18 | ## Alternatively, this file may be used under the terms of the GNU | ||
| 19 | ## General Public License version 3 or (at your option) any later version | ||
| 20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
| 21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
| 22 | ## included in the packaging of this file. Please review the following | ||
| 23 | ## information to ensure the GNU General Public License requirements will | ||
| 24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
| 25 | ## | ||
| 26 | ## $QT_END_LICENSE$ | ||
| 27 | ## | ||
| 28 | ############################################################################ | ||
| 29 | |||
| 30 | RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev" | ||
| 31 | 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 += " \ | |||
| 65 | do_configure_prepend() { | 65 | do_configure_prepend() { |
| 66 | install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs | 66 | install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs |
| 67 | } | 67 | } |
| 68 | |||
| 69 | # make other libgbm providers possible | ||
| 70 | PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/libgbm" | ||