diff --git a/.pick_status.json b/.pick_status.json index fbc39a3b648..25e7b646f54 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2452,7 +2452,7 @@ "description": "meson: with_glx never assigned to 'gallium-xlib', so need add with_glx == 'xlib' for dep_glproto", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "76791db0882b3715cd7d0a47fd14e1f784901b09" }, diff --git a/meson.build b/meson.build index 1550bb208a9..f85650bccea 100644 --- a/meson.build +++ b/meson.build @@ -2131,7 +2131,7 @@ if with_platform_x11 dep_xshmfence = dependency('xshmfence', version : '>= 1.1') endif endif - if with_glx == 'dri' or with_glx == 'gallium-xlib' + if with_glx == 'dri' or with_glx == 'xlib' or with_glx == 'gallium-xlib' dep_glproto = dependency('glproto', version : '>= 1.4.14') endif if with_glx == 'dri'