mesa: remove dri configs unused software-fallback options

[mesa.git] / meson.build

diff --git a/meson.build b/meson.build
index 661cbba9b430db82bdcf4ab4ba26aa5816e7eb50..fa3367d1fa7f606fc0f046f1acf5c32ac0c6dcd6 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -304,7 +304,7 @@ elif _egl == 'true'
   elif not with_shared_glapi
     error('EGL requires shared-glapi')
   elif not with_platforms
-    error('No platforms specified, consider -Dplatforms=drm,x11 at least')
+    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')
   endif
@@ -697,10 +697,16 @@ if with_platform_haiku
   pre_args += '-DHAVE_HAIKU_PLATFORM'
 endif
 
-prog_python2 = find_program('python2')
-has_mako = run_command(prog_python2, '-c', 'import mako')
+prog_python = import('python3').find_python()
+has_mako = run_command(
+  prog_python, '-c',
+  '''
+from distutils.version import StrictVersion
+import mako
+assert StrictVersion(mako.__version__) > StrictVersion("0.8.0")
+  ''')
 if has_mako.returncode() != 0
-  error('Python (2.x) mako module required to build mesa.')
+  error('Python (3.x) mako module >= 0.8.0 required to build mesa.')
 endif
 
 if cc.get_id() == 'gcc' and cc.version().version_compare('< 4.4.6')
@@ -1084,7 +1090,7 @@ _drm_amdgpu_ver = '2.4.93'
 _drm_radeon_ver = '2.4.71'
 _drm_nouveau_ver = '2.4.66'
 _drm_etnaviv_ver = '2.4.89'
-_drm_freedreno_ver = '2.4.92'
+_drm_freedreno_ver = '2.4.93'
 _drm_intel_ver = '2.4.75'
 _drm_ver = '2.4.75'