summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDudemanguy <random342@airmail.cc>2021-12-21 15:23:57 -0600
committerDudemanguy <random342@airmail.cc>2021-12-21 15:30:12 -0600
commitd92cf77be56190dfd7fbac3724f290ceb6ff9437 (patch)
tree2acb4f104fd633073c6d08ceb607bbd2bcd2270b
parent87286fe820b9071a64cd1eee38cf728b8adc801a (diff)
downloadmpv-d92cf77be56190dfd7fbac3724f290ceb6ff9437.tar.bz2
mpv-d92cf77be56190dfd7fbac3724f290ceb6ff9437.tar.xz
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.
-rw-r--r--meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 00954aca9e..407fd1ddea 100644
--- a/meson.build
+++ b/meson.build
@@ -1427,7 +1427,7 @@ vaapi = {
'deps': dependency('libva', version: '>= 1.1.0', required: get_option('vaapi')),
}
vaapi += {'use': vaapi['deps'].found() and libdl.found() and
- (x11['use'] or wayland['use'] or egl_drm['use'])}
+ (x11['use'] or wayland['use'] or egl_drm.allowed())}
if vaapi['use']
dependencies += vaapi['deps']
features += vaapi['name']