From 0afcc8915999c48f2f8886887b2e9c33138f55fd Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 19 Oct 2023 12:36:01 -0400 Subject: flutter-auto: add rcar3 build fix patch 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 --- ...escreen-is-using-eglGetPlatformDisplay-di.patch | 32 ++++++++++++++++++++++ .../toyota/flutter-auto_aglflutter.inc | 4 +++ 2 files changed, 36 insertions(+) create mode 100644 meta-agl-flutter/recipes-graphics/toyota/files/0001-The-ivi-homescreen-is-using-eglGetPlatformDisplay-di.patch 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 index 00000000..58e920e4 --- /dev/null +++ b/meta-agl-flutter/recipes-graphics/toyota/files/0001-The-ivi-homescreen-is-using-eglGetPlatformDisplay-di.patch @@ -0,0 +1,32 @@ +From 29d93f244f5483062f163c366d31f6a1da5be05e Mon Sep 17 00:00:00 2001 +From: Joel Winarske +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 +--- + 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 + diff --git a/meta-agl-flutter/recipes-graphics/toyota/flutter-auto_aglflutter.inc b/meta-agl-flutter/recipes-graphics/toyota/flutter-auto_aglflutter.inc index f54e9683..869b3a4f 100644 --- a/meta-agl-flutter/recipes-graphics/toyota/flutter-auto_aglflutter.inc +++ b/meta-agl-flutter/recipes-graphics/toyota/flutter-auto_aglflutter.inc @@ -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" -- cgit 1.2.3-korg