diff options
Diffstat (limited to 'meta-raspberrypi-extras')
-rw-r--r-- | meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-omx_1.10%.bbappend | 13 | ||||
-rw-r--r-- | meta-raspberrypi-extras/recipes/linux/linux-firmware_%.bbappend | 45 | ||||
-rw-r--r-- | meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch | 34 | ||||
-rw-r--r-- | meta-raspberrypi-extras/recipes/userland/userland_git.bbappend (renamed from meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend) | 11 |
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 5f5e919..0000000 --- a/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-omx_1.10%.bbappend +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | # | ||
2 | # Need to make this conditional to gstreamer1 | ||
3 | # | ||
4 | SRC_URI_append_rpi = " \ | ||
5 | file://0001-config-files-path.patch \ | ||
6 | file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \ | ||
7 | file://0002-fix-decoder-flushing.patch \ | ||
8 | file://0003-no-timeout-on-get-state.patch \ | ||
9 | file://0004-Properly-handle-drain-requests-while-flushing.patch \ | ||
10 | file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \ | ||
11 | " | ||
12 | |||
13 | 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 8e52fa4..0000000 --- a/meta-raspberrypi-extras/recipes/linux/linux-firmware_%.bbappend +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2018 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 | SRCREV = "ba51e861f4444f51e7e83f778575a8146dc514d0" | ||
31 | |||
32 | LIC_FILES_CHKSUM_remove = "\ | ||
33 | file://LICENSE.amd-ucode;md5=3a0de451253cc1edbf30a3c621effee3 \ | ||
34 | file://LICENCE.Netronome;md5=cd2a3e6effe3cdf42731575b8e9477ed \ | ||
35 | file://LICENCE.cypress;md5=cbc5f665d04f741f1e006d2096236ba7 \ | ||
36 | file://WHENCE;md5=038edbc9e744171d8b6235e0224028ba \ | ||
37 | " | ||
38 | |||
39 | LIC_FILES_CHKSUM_append = "\ | ||
40 | file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \ | ||
41 | file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \ | ||
42 | file://LICENCE.cypress;md5=48cd9436c763bf873961f9ed7b5c147b \ | ||
43 | file://WHENCE;md5=df953899bb1431b3991f36950d32894f \ | ||
44 | " | ||
45 | |||
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 0000000..d21fd09 --- /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 @@ | |||
1 | From e977e56df364e3a89e08bd7b8a27d30360b0ccc7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hugo Hromic <hhromic@gmail.com> | ||
3 | Date: Sun, 13 May 2018 10:49:04 +0100 | ||
4 | Subject: [PATCH] khronos: backport typedef for EGL_EXT_image_dma_buf_import | ||
5 | |||
6 | The `gstreamer1.0-plugins-base` package version `1.14` uses `EGL_EXT_image_dma_buf_import`, which | ||
7 | expects the `EGLuint64KHR` typedef that is present in recent versions of Khronos. | ||
8 | However, the older version included in userland does not provide it. | ||
9 | |||
10 | This patch backports the missing typedef from recent Khronos into userland. | ||
11 | See: <https://www.khronos.org/registry/EGL/api/EGL/eglext.h> | ||
12 | |||
13 | Submitted to userland in <https://github.com/raspberrypi/userland/pull/467> | ||
14 | |||
15 | Upstream-Status: Submitted | ||
16 | --- | ||
17 | interface/khronos/include/EGL/eglext.h | 4 ++++ | ||
18 | 1 file changed, 4 insertions(+) | ||
19 | |||
20 | diff --git a/interface/khronos/include/EGL/eglext.h b/interface/khronos/include/EGL/eglext.h | ||
21 | index 89a3369..87cf7d2 100755 | ||
22 | --- a/interface/khronos/include/EGL/eglext.h | ||
23 | +++ b/interface/khronos/include/EGL/eglext.h | ||
24 | @@ -190,6 +190,10 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSy | ||
25 | typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value); | ||
26 | #endif | ||
27 | |||
28 | +#ifndef EGL_KHR_uint64_typedef | ||
29 | +#define EGL_KHR_uint64_typedef 1 | ||
30 | +typedef khronos_uint64_t EGLuint64KHR; | ||
31 | +#endif /* EGL_KHR_uint64_typedef */ | ||
32 | |||
33 | #ifdef __cplusplus | ||
34 | } | ||
diff --git a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend b/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend index 1b8e44e..dc421e5 100644 --- a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend +++ b/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend | |||
@@ -1,6 +1,6 @@ | |||
1 | ############################################################################ | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2017 The Qt Company Ltd. | 3 | ## Copyright (C) 2018 The Qt Company Ltd. |
4 | ## Contact: https://www.qt.io/licensing/ | 4 | ## Contact: https://www.qt.io/licensing/ |
5 | ## | 5 | ## |
6 | ## This file is part of the Boot to Qt meta layer. | 6 | ## This file is part of the Boot to Qt meta layer. |
@@ -27,6 +27,9 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | do_deploy_append() { | 30 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
31 | echo "dtparam=audio=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 31 | |
32 | } | 32 | SRC_URI += "file://0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch" |
33 | |||
34 | SRCREV = "2448644657e5fbfd82299416d218396ee1115ece" | ||
35 | PV = "20180511" | ||