OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: with_glx never assigned to 'gallium-xlib', so need add with_glx == 'xlib' for dep_glproto

Browse Source 
Fixes: 76791db088 ("mesa/x11: Remove the swrast-classic-based fake libGL")

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19221>
(cherry picked from commit 814682d00c)
This commit is contained in:
Yonggang Luo
2022-10-21 19:16:28 +08:00
committed by Dylan Baker
parent 4baf2e9c9e
commit 7a124c1926
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -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"
},

2
meson.build
View File

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