flutter-auto: add rcar3 build fix patch 88/29288/1
authorScott Murray <scott.murray@konsulko.com>
Thu, 19 Oct 2023 16:36:01 +0000 (12:36 -0400)
committerScott Murray <scott.murray@konsulko.com>
Thu, 19 Oct 2023 16:36:01 +0000 (12:36 -0400)
Add the patch with the EGL 1.4 compatibility tweak required to build
for rcar3 that was accidentally dropped in upstream rebasing.  This
should be able to dropped when the next update happens.

Bug-AGL: SPEC-4937

Change-Id: I5635ab099e5e0bd7240f87f4060815829fb51ac0
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
meta-agl-flutter/recipes-graphics/toyota/files/0001-The-ivi-homescreen-is-using-eglGetPlatformDisplay-di.patch [new file with mode: 0644]
meta-agl-flutter/recipes-graphics/toyota/flutter-auto_aglflutter.inc

diff --git a/meta-agl-flutter/recipes-graphics/toyota/files/0001-The-ivi-homescreen-is-using-eglGetPlatformDisplay-di.patch b/meta-agl-flutter/recipes-graphics/toyota/files/0001-The-ivi-homescreen-is-using-eglGetPlatformDisplay-di.patch
new file mode 100644 (file)
index 0000000..58e920e
--- /dev/null
@@ -0,0 +1,32 @@
+From 29d93f244f5483062f163c366d31f6a1da5be05e Mon Sep 17 00:00:00 2001
+From: Joel Winarske <joel.winarske@gmail.com>
+Date: Tue, 6 Jun 2023 14:39:17 -0700
+Subject: [PATCH] The ivi-homescreen is using eglGetPlatformDisplay directly
+ that possible to use in EGL version is 1.5 or greater. On the other hand
+ R-CarH3/M3 is not supporting EGL version is 1.5, only a EGL version is 1.4. 
+ This situation cause build error in R-Car H3/M3.
+
+This patch fix that build error.
+
+Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
+---
+ shell/view/compositor_surface.cc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/shell/view/compositor_surface.cc b/shell/view/compositor_surface.cc
+index 51b13c5..7991c3f 100644
+--- a/shell/view/compositor_surface.cc
++++ b/shell/view/compositor_surface.cc
+@@ -57,8 +57,7 @@ CompositorSurface::CompositorSurface(
+   auto parent_surface = window->GetBaseSurface();
+   if (type == CompositorSurface::egl) {
+-    m_wl.egl_display = eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR,
+-                                             display->GetDisplay(), nullptr);
++    m_wl.egl_display = eglGetDisplay((NativeDisplayType)display->GetDisplay());
+     m_wl.egl_window = wl_egl_window_create(m_wl.surface, width, height);
+     assert(m_wl.egl_display);
+     assert(m_wl.egl_window);
+-- 
+2.41.0
+
index f54e968..869b3a4 100644 (file)
@@ -1,2 +1,6 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://0001-The-ivi-homescreen-is-using-eglGetPlatformDisplay-di.patch"
+
 # NOTE: Cannot use += here due to ??= use in the recipe
 PACKAGECONFIG:append = " client-agl"