Mesa (staging/20.3): meson: drop deprecated EGL platform build options

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: 48bcf3bcc39c98b4912ee94a85cff09c1adcba3c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=48bcf3bcc39c98b4912ee94a85cff09c1adcba3c

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Fri Jul 10 16:11:46 2020 +0200

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 <eric at engestrom.ch>
Acked-by: Emil Velikov <emil.velikov at collabora.com>
Acked-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Cc: 20.3 <mesa-stable>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5844>
(cherry picked from commit f8dc22bf61c1e6008f6954ffd25c1ee322f500c6)

---

 .pick_status.json | 2 +-
 meson.build       | 8 --------
 meson_options.txt | 3 +--
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 40f594c0f64..01b8e9eb947 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -409,7 +409,7 @@
         "description": "meson: drop deprecated EGL platform build options",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/meson.build b/meson.build
index a887f5c235b..d1c3541532c 100644
--- a/meson.build
+++ b/meson.build
@@ -334,14 +334,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 04a0c2bcb95..1a64d0007c1 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.'
 )