KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Erik Faye-Lund 2022-04-29 09:15:58 +02:00 committed by Marge Bot
parent 36250e839b
commit 202cab3d30
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -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

6
meson_options.txt
View File

@ -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(