From 86942d8a6aca0a56f94e1138088133ccd64701f1 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 26 Jun 2018 17:22:15 +1200 Subject: [PATCH] Check for libavutil/hwcontext_drm.h This is an optional feature of libavutil, so this will cause a build failure if it's not present (e.g. on Debian/Ubuntu). --- examples/meson.build | 4 ++++ meson.build | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/examples/meson.build b/examples/meson.build index 04cbf744f..5e5ec60a8 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -5,6 +5,10 @@ libavutil = dependency('libavutil', required: false) libavcodec = dependency('libavcodec', required: false) libavformat = dependency('libavformat', required: false) +if not cc.has_header('libavutil/hwcontext_drm.h', dependencies: libavutil) + libavutil = disabler() +endif + executable('simple', 'simple.c', dependencies: wlroots) executable('pointer', 'pointer.c', dependencies: wlroots) executable('touch', 'touch.c', 'cat.c', dependencies: wlroots) diff --git a/meson.build b/meson.build index b78eea016..b65cd51ab 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ project( 'c', version: '0.0.1', license: 'MIT', - meson_version: '>=0.43.0', + meson_version: '>=0.44.0', default_options: [ 'c_std=c11', 'warning_level=2',