waffle: Forward port Separate-surfaceless-option-from-x11 patch as well

Signed-off-by: Khem Raj <raj.khem@gmail.com>

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
index 9d5003e23e8b9fdfac3166618722f1cf2bf1e440..2a680cc6d90cf3b8df6539cc733e43b8814f9de4 100644 (file)
--- 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
@@ -14,8 +14,6 @@ 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
@@ -26,19 +24,17 @@ index efb51f4..0ee3ee5 100644
  
  # Get dependencies
  if build_wgl
-@@ -101,12 +102,14 @@ else
-   endif
+@@ -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()
  
-   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()
+-  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()
- endif
  
- dep_bash = dependency('bash-completion', required : false)
+   dep_egl = dependency('egl', required : get_option('wayland'))
+   dep_wayland_client = dependency(