From 3bfc37dcb46b43e44ff4f99d1947ccfd603379b9 Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Mon, 15 Nov 2021 08:04:18 -0600 Subject: [PATCH] meson: check for x11 when building the xv option Obvious oversight in the original PR for the meson build. The xv option requires x11 to function. Check for this by using the require method. --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 2e08d9d660..5b181e45d7 100644 --- a/meson.build +++ b/meson.build @@ -1088,7 +1088,11 @@ if x11['use'] 'video/out/x11_common.c') endif -xv = dependency('xv', required: get_option('xv')) +xv_opt = get_option('xv').require( + x11['use'], + error_message: 'x11 could not be found!', +) +xv = dependency('xv', required: xv_opt) if xv.found() dependencies += xv features += 'xv'