raspberrypi: update to sumo

Update meta-raspberrypi layer to the latest revision on sumo branch
and make the necessary adaptations. Userland recipe updated to match
one from master branch.

Change-Id: Ied57793c78fbd022a1b134a6d3165b98bd8a0518
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

4 files changed, 41 insertions, 62 deletions

diff --git a/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-omx_1.10%.bbappend b/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-omx_1.10%.bbappend
deleted file mode 100644
index 5f5e9199..00000000
--- a/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-omx_1.10%.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Need to make this conditional to gstreamer1
-#
-SRC_URI_append_rpi = " \
-             file://0001-config-files-path.patch \
-             file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \
-             file://0002-fix-decoder-flushing.patch \
-             file://0003-no-timeout-on-get-state.patch \
-             file://0004-Properly-handle-drain-requests-while-flushing.patch \
-             file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \
-"
-
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12:"
diff --git a/meta-raspberrypi-extras/recipes/linux/linux-firmware_%.bbappend b/meta-raspberrypi-extras/recipes/linux/linux-firmware_%.bbappend
deleted file mode 100644
index 8e52fa48..00000000
--- a/meta-raspberrypi-extras/recipes/linux/linux-firmware_%.bbappend
+++ /dev/null
@@ -1,45 +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$
-##
-############################################################################
-
-SRCREV = "ba51e861f4444f51e7e83f778575a8146dc514d0"
-
-LIC_FILES_CHKSUM_remove = "\
-    file://LICENSE.amd-ucode;md5=3a0de451253cc1edbf30a3c621effee3 \
-    file://LICENCE.Netronome;md5=cd2a3e6effe3cdf42731575b8e9477ed \
-    file://LICENCE.cypress;md5=cbc5f665d04f741f1e006d2096236ba7 \
-    file://WHENCE;md5=038edbc9e744171d8b6235e0224028ba \
-"
-
-LIC_FILES_CHKSUM_append = "\
-    file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \
-    file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \
-    file://LICENCE.cypress;md5=48cd9436c763bf873961f9ed7b5c147b \
-    file://WHENCE;md5=df953899bb1431b3991f36950d32894f \
-"
-
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
new file mode 100644
index 00000000..d21fd097
--- /dev/null
+++ b/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch
@@ -0,0 +1,34 @@
+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/bootfiles/rpi-config_git.bbappend b/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend
index 1b8e44e4..dc421e57 100644
--- a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
+++ b/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,6 +27,9 @@
 ##
 ############################################################################
 
-do_deploy_append() {
-    echo "dtparam=audio=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-}
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch"
+
+SRCREV = "2448644657e5fbfd82299416d218396ee1115ece"
+PV = "20180511"