Mesa (main): meson: deprecate specifying osmesa-bits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Apr 29 19:56:53 UTC 2022
Module: Mesa
Branch: main
Commit: 202cab3d30808a96677f8bcb4b5f80a0cfbfc615
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=202cab3d30808a96677f8bcb4b5f80a0cfbfc615
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Fri Apr 29 09:15:58 2022 +0200
meson: deprecate specifying osmesa-bits
This option has no meaningful effect any more other than pointlessly
renaming the the library. Let's introduce a new default value called
"unspecified", and complain if it's set to anything else.
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16213>
---
meson.build | 7 ++-----
meson_options.txt | 6 +++---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build
index be02b413120..9b65c152dc7 100644
--- a/meson.build
+++ b/meson.build
@@ -1985,11 +1985,8 @@ if with_osmesa
osmesa_lib_name = 'OSMesa'
endif
osmesa_bits = get_option('osmesa-bits')
- if osmesa_bits != '8'
- if with_dri or with_glx != 'disabled'
- error('OSMesa bits must be 8 if building glx or dri based drivers')
- endif
- osmesa_lib_name = osmesa_lib_name + osmesa_bits
+ if osmesa_bits != 'unspecified'
+ warning('osmesa-bits option is deprecated and have no effect, please remove it.')
endif
endif
diff --git a/meson_options.txt b/meson_options.txt
index 4332906853f..83b5ea941be 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -420,9 +420,9 @@ option(
option(
'osmesa-bits',
type : 'combo',
- value : '8',
- choices : ['8', '16', '32'],
- description : 'Number of channel bits for OSMesa.'
+ value : 'unspecified',
+ choices : ['unspecified', '8', '16', '32'],
+ description : 'DEPRECATED: Number of channel bits for OSMesa.'
)
option(
More information about the mesa-commit
mailing list