From adc9d50ca9bc802fce150e1917f24a2010d9fa4c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Oct 2021 12:41:45 -0700 Subject: [PATCH] waffle: Forward port Separate-surfaceless-option-from-x11 patch as well Signed-off-by: Khem Raj --- ...on-Separate-surfaceless-option-from-x11.patch | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) 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 9d5003e2..2a680cc6 100644 --- 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 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( -- 2.40.1