diff options
Diffstat (limited to 'bsp/meta-freescale/recipes-graphics/waffle/waffle')
2 files changed, 91 insertions, 0 deletions
diff --git a/bsp/meta-freescale/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch b/bsp/meta-freescale/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch new file mode 100644 index 00000000..b5225693 --- /dev/null +++ b/bsp/meta-freescale/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch @@ -0,0 +1,47 @@ +From 87fc7761cff5931a58984c7f7e78f421a0660e0e Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Wed, 22 Apr 2020 13:40:04 -0500 +Subject: [PATCH] meson: Add missing wayland dependency on EGL + +The build was not finding egl.pc due to this +missing dependency. + +Upstream-Status: Pending + +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> + +--- + meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index ca8b127..efb51f4 100644 +--- a/meson.build ++++ b/meson.build +@@ -65,6 +65,7 @@ dep_gl = _dep_null + dep_egl = _dep_null + dep_wayland_client = _dep_null + dep_wayland_egl = _dep_null ++dep_wayland_wayland_egl = _dep_null + dep_x11_xcb = _dep_null + dep_gbm = _dep_null + dep_udev = _dep_null +@@ -90,7 +91,8 @@ else + dep_wayland_client = dependency( + 'wayland-client', version : '>= 1.10', required : get_option('wayland'), + ) +- dep_wayland_egl = dependency( ++ dep_wayland_egl = dependency('egl', required : get_option('wayland')) ++ dep_wayland_wayland_egl = dependency( + 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), + ) + dep_x11_xcb = dependency('x11-xcb', required : get_option('glx')) +@@ -101,7 +103,7 @@ else + dep_udev = dependency('libudev', required : get_option('gbm')) + + build_x11_egl = dep_egl.found() +- build_wayland = dep_wayland_client.found() and dep_wayland_egl.found() ++ build_wayland = dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_wayland_egl.found() + build_glx = dep_gl.found() + build_gbm = dep_gbm.found() and dep_udev.found() + build_surfaceless = dep_egl.found() diff --git a/bsp/meta-freescale/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch b/bsp/meta-freescale/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch new file mode 100644 index 00000000..9d5003e2 --- /dev/null +++ b/bsp/meta-freescale/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch @@ -0,0 +1,44 @@ +From 12ac4372cc6a66e83b61f8510bdaa4f11c72113d Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Wed, 22 Apr 2020 14:08:36 -0500 +Subject: [PATCH] meson: Separate surfaceless option from x11 + +Allow surfaceless build separate from the x11 option. +Also require gbm for surfaceless build. + +Upstream-Status: Pending + +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> + +--- + meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index efb51f4..0ee3ee5 100644 +--- a/meson.build ++++ b/meson.build +@@ -72,6 +72,7 @@ dep_udev = _dep_null + dep_cocoa = _dep_null + dep_core_foundation = _dep_null + dep_gl_headers = _dep_null ++dep_surfaceless = _dep_null + + # Get dependencies + if build_wgl +@@ -101,12 +102,14 @@ else + endif + dep_gbm = dependency('gbm', required : get_option('gbm')) + dep_udev = dependency('libudev', required : get_option('gbm')) ++ dep_surfaceless_egl = dependency('egl', required : get_option('surfaceless_egl')) ++ dep_surfaceless_gbm = dependency('gbm', required : get_option('surfaceless_egl')) + + build_x11_egl = dep_egl.found() + build_wayland = dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_wayland_egl.found() + build_glx = dep_gl.found() + build_gbm = dep_gbm.found() and dep_udev.found() +- build_surfaceless = dep_egl.found() ++ build_surfaceless = dep_surfaceless_egl.found() and dep_surfaceless_gbm.found() + endif + + dep_bash = dependency('bash-completion', required : false) |