From f8dc22bf61c1e6008f6954ffd25c1ee322f500c6 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 10 Jul 2020 16:11:46 +0200 Subject: [PATCH] meson: drop deprecated EGL platform build options These two options were deprecated and announced to be removed in 20.3, so let's drop them now. Signed-off-by: Eric Engestrom Acked-by: Emil Velikov Acked-by: Matt Turner Reviewed-by: Adam Jackson Cc: 20.3 Part-of: --- meson.build | 8 -------- meson_options.txt | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/meson.build b/meson.build index e25f9fcde39..a1692bfb0b3 100644 --- a/meson.build +++ b/meson.build @@ -355,14 +355,6 @@ with_platform_wayland = _platforms.contains('wayland') with_platform_haiku = _platforms.contains('haiku') with_platform_windows = _platforms.contains('windows') -if _platforms.contains('surfaceless') - warning('Platform `surfaceless` is now always selected; setting this option will be an error in Mesa 20.3') -endif - -if _platforms.contains('drm') - warning('Platform `drm` is now automatically selected; setting this option will be an error in Mesa 20.3') -endif - if _platforms.length() != 0 egl_native_platform = _platforms[0] else diff --git a/meson_options.txt b/meson_options.txt index 7637c4cbb73..1847928cea2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -23,8 +23,7 @@ option( type : 'array', value : ['auto'], choices : [ - 'auto', 'x11', 'wayland', 'drm', 'surfaceless', 'haiku', 'android', - 'windows', + 'auto', 'x11', 'wayland', 'haiku', 'android', 'windows', ], description : 'window systems to support. If this is set to `auto`, all platforms applicable will be enabled.' )