From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 29 Jul 2019 20:29:53 +0000 (+0000)
Subject: wayland-ivi-extension: disable building EGLWLMockNavigation example
X-Git-Tag: 8.99.1~90
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=ab866f5707e47a5baff45f98c0f59d4c145dddad;p=AGL%2Fmeta-agl.git

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 <scott.murray@konsulko.com>
---

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 \
-    "
diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0005-disable-EGLWLMockNavigation-example-build.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0005-disable-EGLWLMockNavigation-example-build.patch
new file mode 100644
index 000000000..21028d58a
--- /dev/null
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0005-disable-EGLWLMockNavigation-example-build.patch
@@ -0,0 +1,22 @@
+Disable EGLWLMockNavigation example build
+
+The EGLWLMockNavigation example code has build issues on TI platforms.
+To avoid needing to patch it just for those platforms, just disable
+building it since there are no known users inside AGL.
+
+Upstream-Status: Inappropriate [disable feature]
+
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+
+diff --git a/ivi-layermanagement-examples/CMakeLists.txt b/ivi-layermanagement-examples/CMakeLists.txt
+index 1eab8e9..48bdffd 100644
+--- a/ivi-layermanagement-examples/CMakeLists.txt
++++ b/ivi-layermanagement-examples/CMakeLists.txt
+@@ -24,7 +24,6 @@ project (ivi-layermanagement-examples)
+ # cmake configuration
+ #===========================================================================================================
+ add_subdirectory(LayerManagerControl)
+-add_subdirectory(EGLWLMockNavigation)
+ add_subdirectory(EGLWLInputEventExample)
+ add_subdirectory(layer-add-surfaces)
+ add_subdirectory(multi-touch-viewer)
diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_git.bb b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_git.bb
index d507d2f7e..3935929a5 100644
--- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_git.bb
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension_git.bb
@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \
            file://0003-ivi-controller-load-id-agent-module.patch \
            file://0002-add-LayerManagerControl-error-status.patch \
            file://0004-ivi-ilmcontrol-added-focus-notification.patch \
+           file://0005-disable-EGLWLMockNavigation-example-build.patch \
 "
 SRC_URI_append_wandboard = " file://wandboard_fix_build.patch"
 SRCREV = "736fb654ac81230cf4f9e51a5772d3a02d7639bf"