diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-14 14:55:08 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-02-01 06:58:28 +0000 |
commit | 866106a38dae09dbba01d6a9d77bc80189f94ad8 (patch) | |
tree | 043b512df5417f74f5810803aafad34ef313ffe1 /meta-raspberrypi-extras | |
parent | e2e0faabe64b922df8865ca1df23768ebc3b1fcf (diff) |
yocto: upgrade to yocto 2.6 (thud)
Initial upgrade commit from yocto 2.5.2 (sumo) -> 2.6 (thud).
System & some group 1 devices related meta layers, appends & patches updated:
* poky, meta-openembedded & meta-mingw updated to thud branch
- layer.conf files updated to support thud where applicable
- obsolete gstreamer-plugins-bad BBMASK + bbappend overide removed
- ostree build issues fixed with upstream submodule patch
* meta-freescale & meta-freescale-3rdparty updated to thud branch
* meta-toradex-bsp-common & meta-toradex-nxp update to latest tagged release (2.8b5) in toradex/rocko branch
- to fix build issue a systemd patch taken from meta-toradex-bsp-common toradex/master-next branch (thud compatible)
- mask gstreamer recipes from toradex layer and use older versions for
libav and plugins-ugly, so that they match the imx version of gstreamer.
* meta-raspberry update to latest in master branch (where thud layer compatibility is set)
* meta-tegra update to latest in thud branch
- vulkan disabled from jetsons since NVIDIA's Vulkan support is for X only
Task-number: QTBUG-72413
Change-Id: Ida277b66840babc23e877161a26f1ae1b3c68fda
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-raspberrypi-extras')
3 files changed, 1 insertions, 70 deletions
diff --git a/meta-raspberrypi-extras/conf/layer.conf b/meta-raspberrypi-extras/conf/layer.conf index 0e85afe7..6b2e55a2 100644 --- a/meta-raspberrypi-extras/conf/layer.conf +++ b/meta-raspberrypi-extras/conf/layer.conf @@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_rpi" BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_rpi = "20" -LAYERSERIES_COMPAT_b2qt_rpi = "sumo" +LAYERSERIES_COMPAT_b2qt_rpi = "thud" diff --git a/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch b/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch deleted file mode 100644 index d21fd097..00000000 --- a/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e977e56df364e3a89e08bd7b8a27d30360b0ccc7 Mon Sep 17 00:00:00 2001 -From: Hugo Hromic <hhromic@gmail.com> -Date: Sun, 13 May 2018 10:49:04 +0100 -Subject: [PATCH] khronos: backport typedef for EGL_EXT_image_dma_buf_import - -The `gstreamer1.0-plugins-base` package version `1.14` uses `EGL_EXT_image_dma_buf_import`, which -expects the `EGLuint64KHR` typedef that is present in recent versions of Khronos. -However, the older version included in userland does not provide it. - -This patch backports the missing typedef from recent Khronos into userland. -See: <https://www.khronos.org/registry/EGL/api/EGL/eglext.h> - -Submitted to userland in <https://github.com/raspberrypi/userland/pull/467> - -Upstream-Status: Submitted ---- - interface/khronos/include/EGL/eglext.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/interface/khronos/include/EGL/eglext.h b/interface/khronos/include/EGL/eglext.h -index 89a3369..87cf7d2 100755 ---- a/interface/khronos/include/EGL/eglext.h -+++ b/interface/khronos/include/EGL/eglext.h -@@ -190,6 +190,10 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSy - typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value); - #endif - -+#ifndef EGL_KHR_uint64_typedef -+#define EGL_KHR_uint64_typedef 1 -+typedef khronos_uint64_t EGLuint64KHR; -+#endif /* EGL_KHR_uint64_typedef */ - - #ifdef __cplusplus - } diff --git a/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend b/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend deleted file mode 100644 index dc421e57..00000000 --- a/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch" - -SRCREV = "2448644657e5fbfd82299416d218396ee1115ece" -PV = "20180511" |