diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-08 15:51:16 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-14 05:54:08 +0000 |
commit | a38dee3c2e75057034a1eea88b309df3abd5bfe5 (patch) | |
tree | a1ac6a6839d24d409ef92bbe1d55860f1d681944 | |
parent | ba5acea9a6ffa24a216fc2a0f28db5595241745b (diff) | |
download | meta-boot2qt-a38dee3c2e75057034a1eea88b309df3abd5bfe5.tar.gz |
BBB: update elgplatform header
Use proper typedef for EGLNativeDisplayType to fix build issue in qtbase.
error: invalid conversion from 'EGLNativeDisplayType {aka int}' to 'void*'
Change-Id: Icfec5ea624a9b38adfc79fb50d033d652ce1d759
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | meta-ti-extras/recipes/libgles/ti-sgx-ddk-um/0001-Change-typedef-for-EGLNativeDisplayType.patch | 28 | ||||
-rw-r--r-- | meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um/0001-Change-typedef-for-EGLNativeDisplayType.patch b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um/0001-Change-typedef-for-EGLNativeDisplayType.patch new file mode 100644 index 0000000..8a986ef --- /dev/null +++ b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um/0001-Change-typedef-for-EGLNativeDisplayType.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From fdbf7768bcd14b182b0372631fe762a3fde16a49 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Thu, 8 Jun 2017 15:42:58 +0300 | ||
4 | Subject: [PATCH] Change typedef for EGLNativeDisplayType | ||
5 | |||
6 | Change EGLNativeDisplayType to void* as it's in more recent versions | ||
7 | --- | ||
8 | targetfs/ti335x/include/EGL/eglplatform.h | 7 +------ | ||
9 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
10 | |||
11 | diff --git a/targetfs/ti335x/include/EGL/eglplatform.h b/targetfs/ti335x/include/EGL/eglplatform.h | ||
12 | index 7943741..e71df55 100644 | ||
13 | --- a/targetfs/ti335x/include/EGL/eglplatform.h | ||
14 | +++ b/targetfs/ti335x/include/EGL/eglplatform.h | ||
15 | @@ -94,12 +94,7 @@ typedef Window EGLNativeWindowType; | ||
16 | |||
17 | /* NULLWS fallback */ | ||
18 | |||
19 | -#if defined(_WIN64) || __WORDSIZE == 64 | ||
20 | -typedef khronos_int64_t EGLNativeDisplayType; | ||
21 | -#else | ||
22 | -typedef int EGLNativeDisplayType; | ||
23 | -#endif | ||
24 | - | ||
25 | +typedef void* EGLNativeDisplayType; | ||
26 | typedef void* EGLNativePixmapType; | ||
27 | typedef void* EGLNativeWindowType; | ||
28 | |||
diff --git a/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend index 94ef641..c2251a8 100644 --- a/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend +++ b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | 30 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" |
31 | SRC_URI += "\ | 31 | SRC_URI += "\ |
32 | file://0001-Change-typedef-for-EGLNativeDisplayType.patch \ | ||
32 | file://99-fb.rules \ | 33 | file://99-fb.rules \ |
33 | file://pvr.service \ | 34 | file://pvr.service \ |
34 | " | 35 | " |