From 8810e9508280ef4fcfd9e181f7042c8517e098b7 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 22 Jun 2021 21:05:53 +0200 Subject: [PATCH] Revert "build: workaround for meson disabler object not working with if not" This reverts commit 9796abccedef881e99d293a2658c4da9466acd88. This Meson issue has been fixed upstream for a while. We require 0.56.0 so we should never hit an unpatched Meson. --- examples/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/meson.build b/examples/meson.build index 1ce02f0d..2c69fffd 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -18,8 +18,7 @@ else libepoll = dependency('', required: false) endif -# Check if libavutil is found because of https://github.com/mesonbuild/meson/issues/6010 -if libavutil.found() and not cc.has_header('libavutil/hwcontext_drm.h', dependencies: libavutil) +if not cc.has_header('libavutil/hwcontext_drm.h', dependencies: libavutil) libavutil = disabler() endif