History

meson: fix incorrect egl_drm operator in build

Back when the meson build was still in the PR state, this particular variable was a dictionary. Later, it was refactored to simply be a feature object instead. All uses of egl_drm['use'] should have been replaced with egl_drm.allowed() but this particular line was missed (that's what I get for not just doing find/replace). The conditional in this line is usually satisified before egl_drm ever needs to be checked which was why no one noticed until now. Fixes #9631.

Dudemanguy committed 4 years ago

Commit d92cf771 parent 87286fe1 file · +1 −1Browse files

Unified · Split

meson.build+1−1
@@ -1427,7 +1427,7 @@ vaapi = { · 1426 unmodified lines
1427 'deps': dependency('libva', version: '>= 1.1.0', required: get_option('vaapi')),1427 'deps': dependency('libva', version: '>= 1.1.0', required: get_option('vaapi')),
1428}1428}
1429vaapi += {'use': vaapi['deps'].found() and libdl.found() and1429vaapi += {'use': vaapi['deps'].found() and libdl.found() and
1430 (x11['use'] or wayland['use'] or egl_drm['use'])}1430 (x11['use'] or wayland['use'] or egl_drm.allowed())}
1431if vaapi['use']1431if vaapi['use']
1432 dependencies += vaapi['deps']1432 dependencies += vaapi['deps']
1433 features += vaapi['name']1433 features += vaapi['name']

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t