From 5d2d2de60ebab140f7006a595c9c7087bddec1df Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 29 Jul 2019 20:29:53 +0000 Subject: wayland-ivi-extension: disable building EGLWLMockNavigation example Disable building the EGLWLMockNavigation in wayland-ivi-extension to avoid needing to patch it to build for the TI platforms. This fixes the issue of meta-agl-bsp/meta-ti breaking non-graphics profile builds like the telematics profile, and seems reasonable since there are no known users inside AGL. Since it is no longer needed, also remove the offending patch from meta-agl-bsp/meta-ti. Bug-AGL: SPEC-2677 Change-Id: If87c3c238e880d01f99401ea4610616656f16185 Signed-off-by: Scott Murray --- .../wayland-ivi-extension/force-type-conversion.patch | 13 ------------- .../wayland/wayland-ivi-extension_%.bbappend | 5 ----- 2 files changed, 18 deletions(-) delete mode 100644 meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch delete mode 100644 meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_%.bbappend (limited to 'meta-agl-bsp') diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch deleted file mode 100644 index 7256abb56..000000000 --- a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp b/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp -index 50c3e38..2f4910e 100644 ---- a/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp -+++ b/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp -@@ -248,7 +248,7 @@ bool OpenGLES2App::createEGLContext(SurfaceConfiguration* config) - m_eglContextStruct.eglSurface = NULL; - m_eglContextStruct.eglContext = NULL; - -- m_eglContextStruct.eglDisplay = eglGetDisplay(m_wlContextStruct.wlDisplay); -+ m_eglContextStruct.eglDisplay = eglGetDisplay((EGLNativeDisplayType)m_wlContextStruct.wlDisplay); - if (!m_eglContextStruct.eglDisplay) - { - cout << "Error: eglGetDisplay() failed.\n"; diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_%.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_%.bbappend deleted file mode 100644 index e9a57d324..000000000 --- a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" - -SRC_URI_append = "\ - file://force-type-conversion.patch \ - " -- cgit 1.2.3-korg