diff options
Diffstat (limited to 'recipes-graphics/waffle')
3 files changed, 102 insertions, 6 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 new file mode 100644 index 00000000..01849d92 --- /dev/null +++ b/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(-) + +Index: git/meson.build +=================================================================== +--- git.orig/meson.build ++++ git/meson.build +@@ -64,6 +64,7 @@ dep_drm = _dep_null + dep_egl = _dep_null + dep_wayland_client = _dep_null + dep_wayland_egl = _dep_null ++dep_wayland_wayland_egl = _dep_null + dep_wayland_scanner = _dep_null + dep_wayland_proto = _dep_null + dep_x11_xcb = _dep_null +@@ -104,7 +105,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_wayland_scanner = dependency( +@@ -122,7 +124,7 @@ else + 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() ++ 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() and dep_wayland_wayland_egl.found() + + # We're interested only in the headers provided + # FINISHME: make x11_xcb compile-only dependency diff --git a/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch b/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch new file mode 100644 index 00000000..01b2b040 --- /dev/null +++ b/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch @@ -0,0 +1,38 @@ +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(-) + +Index: git/meson.build +=================================================================== +--- git.orig/meson.build ++++ git/meson.build +@@ -72,6 +72,7 @@ dep_gbm = _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 +@@ -99,7 +100,8 @@ else + build_gbm = dep_drm.found() and dep_egl.found() and dep_gbm.found() + + dep_egl = dependency('egl', required : get_option('surfaceless_egl')) +- build_surfaceless = dep_egl.found() ++ dep_gbm = dependency('gbm', required : get_option('surfaceless_egl')) ++ build_surfaceless = dep_egl.found() and dep_gbm.found() + + dep_egl = dependency('egl', required : get_option('wayland')) + dep_wayland_client = dependency( diff --git a/recipes-graphics/waffle/waffle_%.bbappend b/recipes-graphics/waffle/waffle_%.bbappend index 9a9de0ed..e88f558d 100644 --- a/recipes-graphics/waffle/waffle_%.bbappend +++ b/recipes-graphics/waffle/waffle_%.bbappend @@ -1,7 +1,18 @@ -PACKAGECONFIG_X11 = "" -PACKAGECONFIG_X11_append_imxgpu3d = " x11-egl glx" -PACKAGECONFIG_imxgpu = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gbm', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', '${PACKAGECONFIG_X11}', \ - '', d), d)} \ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-meson-Add-missing-wayland-dependency-on-EGL.patch \ + file://0002-meson-Separate-surfaceless-option-from-x11.patch \ +" + +PACKAGECONFIG_IMXGPU_X11 = "" +PACKAGECONFIG_IMXGPU_X11:imxgpu3d = "x11-egl glx" +PACKAGECONFIG_IMXGPU_GBM = "gbm" +PACKAGECONFIG_IMXGPU_GBM:mx6-nxp-bsp = "" +PACKAGECONFIG_IMXGPU_GBM:mx7-nxp-bsp = "" +PACKAGECONFIG:imxgpu = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', '${PACKAGECONFIG_IMXGPU_X11}', \ + '', d), d)} \ + ${PACKAGECONFIG_IMXGPU_GBM} \ " |