3 files changed, 1 insertions, 70 deletions

diff --git a/meta-raspberrypi-extras/conf/layer.conf b/meta-raspberrypi-extras/conf/layer.conf
index 0e85afe..6b2e55a 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 d21fd09..0000000
--- 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 dc421e5..0000000
--- 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"