summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeng Li <Meng.Li@windriver.com>2024-01-15 18:23:46 +0800
committerMeng Li <meng.li@windriver.com>2024-01-16 11:22:05 +0800
commita9d4c5ebbb76d52d2781d9324be23e65be5deada (patch)
treeb3de285c2908344ab620756e5a4413aaa917ae78
parent47e0b467d8555e38a996b731977d9eed9ab02051 (diff)
downloadmeta-freescale-a9d4c5ebbb76d52d2781d9324be23e65be5deada.tar.gz
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 <Meng.Li@windriver.com>
-rw-r--r--recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch2
1 files changed, 1 insertions, 1 deletions
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 5f587d84..a898f0a9 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 <tom.hochstein@nxp.com>
35 ) 35 )
36 dep_wayland_scanner = dependency( 36 dep_wayland_scanner = dependency(
37@@ -120,7 +122,7 @@ else 37@@ -120,7 +122,7 @@ else
38 wayland_xdg_shell_xml = join_paths(dep_wayland_proto.get_pkgconfig_variable('pkgdatadir'), 38 wayland_xdg_shell_xml = join_paths(dep_wayland_proto.get_variable(pkgconfig: 'pkgdatadir'),
39 'stable/xdg-shell/xdg-shell.xml') 39 'stable/xdg-shell/xdg-shell.xml')
40 endif 40 endif
41- 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() 41- 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()