From a38dee3c2e75057034a1eea88b309df3abd5bfe5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 8 Jun 2017 15:51:16 +0300 Subject: 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 --- ...1-Change-typedef-for-EGLNativeDisplayType.patch | 28 ++++++++++++++++++++++ .../recipes/libgles/ti-sgx-ddk-um_%.bbappend | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta-ti-extras/recipes/libgles/ti-sgx-ddk-um/0001-Change-typedef-for-EGLNativeDisplayType.patch 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 @@ +From fdbf7768bcd14b182b0372631fe762a3fde16a49 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 8 Jun 2017 15:42:58 +0300 +Subject: [PATCH] Change typedef for EGLNativeDisplayType + +Change EGLNativeDisplayType to void* as it's in more recent versions +--- + targetfs/ti335x/include/EGL/eglplatform.h | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/targetfs/ti335x/include/EGL/eglplatform.h b/targetfs/ti335x/include/EGL/eglplatform.h +index 7943741..e71df55 100644 +--- a/targetfs/ti335x/include/EGL/eglplatform.h ++++ b/targetfs/ti335x/include/EGL/eglplatform.h +@@ -94,12 +94,7 @@ typedef Window EGLNativeWindowType; + + /* NULLWS fallback */ + +-#if defined(_WIN64) || __WORDSIZE == 64 +-typedef khronos_int64_t EGLNativeDisplayType; +-#else +-typedef int EGLNativeDisplayType; +-#endif +- ++typedef void* EGLNativeDisplayType; + typedef void* EGLNativePixmapType; + typedef void* EGLNativeWindowType; + 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 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += "\ + file://0001-Change-typedef-for-EGLNativeDisplayType.patch \ file://99-fb.rules \ file://pvr.service \ " -- cgit v1.2.3-54-g00ecf