MIRRORS/meta-freescale
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-freescale.git synced 2025-10-22 14:52:19 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

waffle: Fix broken patches

Browse Source 
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
This commit is contained in:
Tom Hochstein 2024-04-25 06:25:15 -07:00
parent df4a0ae511
commit 259541a36c
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch
View File

@ -18,7 +18,7 @@ Index: git/meson.build
===================================================================
--- git.orig/meson.build
+++ git/meson.build
@@ -65,6 +65,7 @@ dep_gl = _dep_null
@@ -64,6 +64,7 @@ dep_drm = _dep_null
dep_egl = _dep_null
dep_wayland_client = _dep_null
dep_wayland_egl = _dep_null
@ -26,7 +26,7 @@ Index: git/meson.build
dep_wayland_scanner = _dep_null
dep_wayland_proto = _dep_null
dep_x11_xcb = _dep_null
@@ -106,7 +107,8 @@ else
@@ -104,7 +105,8 @@ else
dep_wayland_client = dependency(
'wayland-client', version : '>= 1.10', required : get_option('wayland'),
)
@ -36,7 +36,7 @@ Index: git/meson.build
'wayland-egl', version : '>= 9.1', required : get_option('wayland'),
)
dep_wayland_scanner = dependency(
@@ -124,7 +126,7 @@ else
@@ -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
@ -44,4 +44,4 @@ Index: git/meson.build
+ 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 and udev compile-only dependency
# FINISHME: make x11_xcb compile-only dependency

22
recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch
View File

@ -14,9 +14,11 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/meson.build
+++ b/meson.build
@@ -72,6 +72,7 @@ dep_udev = _dep_null
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
@ -24,17 +26,13 @@ Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
# Get dependencies
if build_wgl
@@ -96,10 +97,11 @@ else
dep_egl = dependency('egl', required : get_option('gbm'))
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_gbm = dep_egl.found() and dep_gbm.found() and dep_udev.found()
@@ -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'))
dep_egl = dependency('egl', required : get_option('surfaceless_egl'))
- build_surfaceless = dep_egl.found()
+ build_surfaceless = dep_surfaceless_egl.found() and dep_surfaceless_gbm.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(