From 86942d8a6aca0a56f94e1138088133ccd64701f1 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 26 Jun 2018 17:22:15 +1200 Subject: [PATCH 1/2] 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 04cbf744..5e5ec60a 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 b78eea01..b65cd51a 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', From 0e19b024c6c2273665bd751ce2ac15b806684641 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 26 Jun 2018 20:14:08 +1200 Subject: [PATCH 2/2] Add minimum version for ffmpeg 4.0 libraries --- examples/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/meson.build b/examples/meson.build index 5e5ec60a..d8df0bfc 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -1,9 +1,10 @@ threads = dependency('threads') wayland_cursor = dependency('wayland-cursor') -libavutil = dependency('libavutil', required: false) -libavcodec = dependency('libavcodec', required: false) -libavformat = dependency('libavformat', required: false) +# These versions correspond to ffmpeg 4.0 +libavutil = dependency('libavutil', version: '>=56.14.100', required: false) +libavcodec = dependency('libavcodec', version: '>=58.18.100', required: false) +libavformat = dependency('libavformat', version: '>=58.12.100', required: false) if not cc.has_header('libavutil/hwcontext_drm.h', dependencies: libavutil) libavutil = disabler()