From a9d4c5ebbb76d52d2781d9324be23e65be5deada Mon Sep 17 00:00:00 2001 From: Meng Li Date: Mon, 15 Jan 2024 18:23:46 +0800 Subject: [PATCH] meta-freescale: update waffle patch to compatible with version 1.7.2 In yocto release kirkstone, waffle package is upgraded from 1.7.0 to 1.7.2, and there is below error reported when applying patch: Applying patch 0001-meson-Add-missing-wayland-dependency-on-EGL.patch patching file meson.build Hunk #1 succeeded at 65 (offset 2 lines). Hunk #2 succeeded at 107 (offset 2 lines). Hunk #3 succeeded at 126 with fuzz 1 (offset 4 lines). So, adjust the patch context to compatible with version 1.7.2 Signed-off-by: Meng Li --- .../0001-meson-Add-missing-wayland-dependency-on-EGL.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch b/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch index 5f587d84c..a898f0a96 100644 --- a/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch +++ b/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch @@ -35,7 +35,7 @@ Signed-off-by: Tom Hochstein ) dep_wayland_scanner = dependency( @@ -120,7 +122,7 @@ else - wayland_xdg_shell_xml = join_paths(dep_wayland_proto.get_pkgconfig_variable('pkgdatadir'), + wayland_xdg_shell_xml = join_paths(dep_wayland_proto.get_variable(pkgconfig: 'pkgdatadir'), 'stable/xdg-shell/xdg-shell.xml') endif - build_wayland = dep_egl.found() and dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_scanner.found() and dep_wayland_proto.found()