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@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16213>
This commit is contained in:
parent
36250e839b
commit
202cab3d30
|
@ -1985,11 +1985,8 @@ if with_osmesa
|
||||||
osmesa_lib_name = 'OSMesa'
|
osmesa_lib_name = 'OSMesa'
|
||||||
endif
|
endif
|
||||||
osmesa_bits = get_option('osmesa-bits')
|
osmesa_bits = get_option('osmesa-bits')
|
||||||
if osmesa_bits != '8'
|
if osmesa_bits != 'unspecified'
|
||||||
if with_dri or with_glx != 'disabled'
|
warning('osmesa-bits option is deprecated and have no effect, please remove it.')
|
||||||
error('OSMesa bits must be 8 if building glx or dri based drivers')
|
|
||||||
endif
|
|
||||||
osmesa_lib_name = osmesa_lib_name + osmesa_bits
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -420,9 +420,9 @@ option(
|
||||||
option(
|
option(
|
||||||
'osmesa-bits',
|
'osmesa-bits',
|
||||||
type : 'combo',
|
type : 'combo',
|
||||||
value : '8',
|
value : 'unspecified',
|
||||||
choices : ['8', '16', '32'],
|
choices : ['unspecified', '8', '16', '32'],
|
||||||
description : 'Number of channel bits for OSMesa.'
|
description : 'DEPRECATED: Number of channel bits for OSMesa.'
|
||||||
)
|
)
|
||||||
|
|
||||||
option(
|
option(
|
||||||
|
|
Loading…
Reference in New Issue