meson: remove deprecated osmesa-bits option

We've released several new major versions since this was deprecated in
202cab3d308 ("meson: deprecate specifying osmesa-bits"), so it's
probably about time to remove it.

Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20905>

diff --git a/meson.build b/meson.build
index 479ce81..b27a654 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1870,10 +1870,6 @@ if with_osmesa
   else
     osmesa_lib_name = 'OSMesa'
   endif
-  osmesa_bits = get_option('osmesa-bits')
-  if osmesa_bits != 'unspecified'
-    warning('osmesa-bits option is deprecated and have no effect, please remove it.')
-  endif
 endif
 
 # TODO: symbol mangling

diff --git a/meson_options.txt b/meson_options.txt
index 3a1490f..795234d 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -393,14 +393,6 @@ option(
   description : 'Build OSmesa.'
 )
 option(
-  'osmesa-bits',
-  type : 'combo',
-  value : 'unspecified',
-  choices : ['unspecified', '8', '16', '32'],
-  description : 'DEPRECATED: Number of channel bits for OSMesa.'
-)
-
-option(
   'tools',
   type : 'array',
   value : [],