Mesa (master): meson: fix platforms check for `-D egl=true`

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 7c4423cce98f95c3ab7349b3f7abc4a558cb6c48
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c4423cce98f95c3ab7349b3f7abc4a558cb6c48

Author: Eric Engestrom 
Date:   Mon Jun  4 11:26:10 2018 +0100

meson: fix platforms check for `-D egl=true`

Fixes: 0ed6a87a106b6e2266e0 "meson: fix platforms=[]"
Reported-by: Christoph Haag 
Reviewed-by: Dylan Baker 
Signed-off-by: Eric Engestrom 

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 7b7c118d77..1d1b2a979b 100644
--- a/meson.build
+++ b/meson.build
@@ -292,7 +292,7 @@ elif _egl == 'true'
 error('EGL requires dri')
   elif not with_shared_glapi
 error('EGL requires shared-glapi')
-  elif with_platforms
+  elif not with_platforms
 error('No platforms specified, consider -Dplatforms=drm,x11 at least')
   elif not ['disabled', 'dri'].contains(with_glx)
 error('EGL requires dri, but a GLX is being built without dri')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (master): meson: fix platforms=[]

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 0ed6a87a106b6e2266e01c5d7e31344229833c8d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ed6a87a106b6e2266e01c5d7e31344229833c8d

Author: Eric Engestrom 
Date:   Thu May 10 16:11:29 2018 +0100

meson: fix platforms=[]

Fixes: 5608d0a2cee47c7d037f ("meson: use array type options")
Signed-off-by: Eric Engestrom 

---

 meson.build | 28 +---
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/meson.build b/meson.build
index 8db260c952..ab99c26313 100644
--- a/meson.build
+++ b/meson.build
@@ -221,12 +221,6 @@ else
   with_dri_platform = 'none'
 endif
 
-with_platform_android = false
-with_platform_wayland = false
-with_platform_x11 = false
-with_platform_drm = false
-with_platform_surfaceless = false
-egl_native_platform = ''
 _platforms = get_option('platforms')
 if _platforms.contains('auto')
   if system_has_kms_drm
@@ -239,13 +233,17 @@ if _platforms.contains('auto')
 error('Unknown OS. Please pass -Dplatforms to set platforms. Patches 
gladly accepted to fix this.')
   endif
 endif
-if _platforms != ['']
-  with_platform_android = _platforms.contains('android')
-  with_platform_x11 = _platforms.contains('x11')
-  with_platform_wayland = _platforms.contains('wayland')
-  with_platform_drm = _platforms.contains('drm')
-  with_platform_haiku = _platforms.contains('haiku')
-  with_platform_surfaceless = _platforms.contains('surfaceless')
+
+with_platform_android = _platforms.contains('android')
+with_platform_x11 = _platforms.contains('x11')
+with_platform_wayland = _platforms.contains('wayland')
+with_platform_drm = _platforms.contains('drm')
+with_platform_haiku = _platforms.contains('haiku')
+with_platform_surfaceless = _platforms.contains('surfaceless')
+
+with_platforms = false
+if _platforms.length() != 0 and _platforms != ['']
+  with_platforms = true
   egl_native_platform = _platforms[0]
 endif
 
@@ -288,13 +286,13 @@ endif
 
 _egl = get_option('egl')
 if _egl == 'auto'
-  with_egl = with_dri and with_shared_glapi and egl_native_platform != ''
+  with_egl = with_dri and with_shared_glapi and with_platforms
 elif _egl == 'true'
   if not with_dri
 error('EGL requires dri')
   elif not with_shared_glapi
 error('EGL requires shared-glapi')
-  elif egl_native_platform == ''
+  elif with_platforms
 error('No platforms specified, consider -Dplatforms=drm,x11 at least')
   elif not ['disabled', 'dri'].contains(with_glx)
 error('EGL requires dri, but a GLX is being built without dri')

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit