diff options
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | meson_options.txt | 8 | ||||
| -rw-r--r-- | src/gallium/targets/dri/meson.build | 8 |
3 files changed, 16 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 8cbe9937fae..90ebd0dcbff 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2154,7 +2154,7 @@ "description": "gallium: Add option to not add version to libgallium filename", "nominated": false, "nomination_type": 3, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/meson_options.txt b/meson_options.txt index bbc4fd98cf1..718c6b8a7e7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -66,6 +66,14 @@ option( ) option( + 'unversion-libgallium', + type : 'boolean', + value : false, + description : 'Do not include mesa version in libgallium DSO filename. ' + + 'Do not enable unless you know what you are doing. Default: false' +) + +option( 'dri-search-path', type : 'string', value : '', diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index c6cc48e503d..c58eaaa220c 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -22,8 +22,14 @@ if with_ld_dynamic_list gallium_dri_link_depends += files('../dri.dyn') endif +if get_option('unversion-libgallium') + libgallium_name = 'gallium_dri' +else + libgallium_name = 'gallium-@0@'.format(meson.project_version()) +endif + libgallium_dri = shared_library( - 'gallium-@0@'.format(meson.project_version()), + libgallium_name, files('dri_target.c'), include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers, |