diff options
author | Hugo Hromic <hhromic@gmail.com> | 2018-07-02 17:28:15 +0100 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.com> | 2018-07-04 15:33:16 +0100 |
commit | e713c3f60d74fbb864122f8f11a80ca302d53da3 (patch) | |
tree | b0f8f414a8288a6bf8f9305e90b1a2b42a251d86 /recipes-graphics | |
parent | 3b6549a5e016efe63c9d1463948b9de1ee5d89ed (diff) | |
download | meta-raspberrypi-e713c3f60d74fbb864122f8f11a80ca302d53da3.tar.gz |
userland: drop now obsolete backport khronos typedef patch
The patch introduced in 237e0c7 is now fixed upstream in gstreamer-base-1.14.1, hence drop it.
See: <https://github.com/GStreamer/gst-plugins-base/commit/2f3ff84f4082097a36732a91734121fb209efb84>
Signed-off-by: Hugo Hromic <hhromic@gmail.com>
Diffstat (limited to 'recipes-graphics')
-rw-r--r-- | recipes-graphics/userland/userland/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch | 35 | ||||
-rw-r--r-- | recipes-graphics/userland/userland_git.bb | 1 |
2 files changed, 0 insertions, 36 deletions
diff --git a/recipes-graphics/userland/userland/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch b/recipes-graphics/userland/userland/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch deleted file mode 100644 index fbfdb86..0000000 --- a/recipes-graphics/userland/userland/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 8403fb3869f56ea7492fa6265bd6cd1dd5146e6e 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 | --- | ||
18 | interface/khronos/include/EGL/eglext.h | 4 ++++ | ||
19 | 1 file changed, 4 insertions(+) | ||
20 | |||
21 | diff --git a/interface/khronos/include/EGL/eglext.h b/interface/khronos/include/EGL/eglext.h | ||
22 | index d7e5ba7..4ce762d 100755 | ||
23 | --- a/interface/khronos/include/EGL/eglext.h | ||
24 | +++ b/interface/khronos/include/EGL/eglext.h | ||
25 | @@ -190,6 +190,10 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSy | ||
26 | typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value); | ||
27 | #endif | ||
28 | |||
29 | +#ifndef EGL_KHR_uint64_typedef | ||
30 | +#define EGL_KHR_uint64_typedef 1 | ||
31 | +typedef khronos_uint64_t EGLuint64KHR; | ||
32 | +#endif /* EGL_KHR_uint64_typedef */ | ||
33 | |||
34 | #ifndef EGL_WL_bind_wayland_display | ||
35 | #define EGL_WL_bind_wayland_display 1 | ||
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb index b789290..2ea6af6 100644 --- a/recipes-graphics/userland/userland_git.bb +++ b/recipes-graphics/userland/userland_git.bb | |||
@@ -38,7 +38,6 @@ SRC_URI = "\ | |||
38 | file://0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch \ | 38 | file://0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch \ |
39 | file://0015-EGL-glplatform.h-define-EGL_CAST.patch \ | 39 | file://0015-EGL-glplatform.h-define-EGL_CAST.patch \ |
40 | file://0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch \ | 40 | file://0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch \ |
41 | file://0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch \ | ||
42 | " | 41 | " |
43 | S = "${WORKDIR}/git" | 42 | S = "${WORKDIR}/git" |
44 | 43 | ||