summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Hromic <hhromic@gmail.com>2018-06-25 17:30:56 +0100
committerAndrei Gherzan <andrei@gherzan.com>2018-06-27 13:28:52 +0100
commit71a040dc118c686119d6b88481b72d64586e7b3c (patch)
treeb91848e7ceb05578cb0a62e36b73b1516307d1d3
parentb2da4618b0ac2ad7dbc26387cad4c03796f8a06e (diff)
downloadmeta-raspberrypi-71a040dc118c686119d6b88481b72d64586e7b3c.tar.gz
userland: fix backport khronos typedef patch
The patch in 237e0c7 used a define guard that clashes with an actual feature of Khronos (EGL_KHR_stream). This makes some packages such as `qtbase` to think that the outdated Krhonos in userland has newer features. This fix uses a more specific name for the relevant define guard (EGL_KHR_uint64_typedef). Signed-off-by: Hugo Hromic <hhromic@gmail.com>
-rw-r--r--recipes-graphics/userland/userland/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch6
1 files changed, 3 insertions, 3 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
index 3048135..fbfdb86 100644
--- 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
@@ -26,10 +26,10 @@ index d7e5ba7..4ce762d 100755
26 typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value); 26 typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
27 #endif 27 #endif
28 28
29+#ifndef EGL_KHR_stream 29+#ifndef EGL_KHR_uint64_typedef
30+#define EGL_KHR_stream 1 30+#define EGL_KHR_uint64_typedef 1
31+typedef khronos_uint64_t EGLuint64KHR; 31+typedef khronos_uint64_t EGLuint64KHR;
32+#endif /* EGL_KHR_stream */ 32+#endif /* EGL_KHR_uint64_typedef */
33 33
34 #ifndef EGL_WL_bind_wayland_display 34 #ifndef EGL_WL_bind_wayland_display
35 #define EGL_WL_bind_wayland_display 1 35 #define EGL_WL_bind_wayland_display 1