[Mesa-dev] [PATCH] meson: Don't allow building EGL on on KMS systems or Haiku

Dylan Baker dylan at pnwbakers.com
Mon Oct 1 19:43:22 UTC 2018


Currently mesa only supports EGL for KMS (Linux, *BSD) systems and
Haiku, we should actually enforce this. This fixes the default build on
MacOS.
---

 meson.build | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 97693b91ecf..202f9d740d7 100644
--- a/meson.build
+++ b/meson.build
@@ -306,7 +306,10 @@ endif
 
 _egl = get_option('egl')
 if _egl == 'auto'
-  with_egl = with_dri and with_shared_glapi and with_platforms
+  with_egl = (
+    (system_has_kms_drm or with_platform_haiku) and
+    with_dri and with_shared_glapi and with_platforms
+  )
 elif _egl == 'true'
   if not with_dri
     error('EGL requires dri')
@@ -316,6 +319,8 @@ elif _egl == 'true'
     error('No platforms specified, consider -Dplatforms=drm,x11,surfaceless at least')
   elif not ['disabled', 'dri'].contains(with_glx)
     error('EGL requires dri, but a GLX is being built without dri')
+  elif not (system_has_kms_drm or with_platform_haiku)
+    error('EGL is not valid on systems that don\'t use KMS except Haiku.')
   endif
   with_egl = true
 else
-- 
2.19.0



More information about the mesa-dev mailing list