diff options
| author | emersion <contact@emersion.fr> | 2018-06-26 10:13:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 10:13:48 +0100 |
| commit | 159835de249acf9a87b2e75b97db6c5fab0a600b (patch) | |
| tree | b5b26fa1df37f63e60b972cf7a71bb321ff32483 | |
| parent | 4852010f296bf7fc3f291d3cec6f109308ae42fa (diff) | |
| parent | 0e19b024c6c2273665bd751ce2ac15b806684641 (diff) | |
Merge pull request #1089 from ascent12/hwcontext_drm
Check for libavutil/hwcontext_drm.h
| -rw-r--r-- | examples/meson.build | 11 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/examples/meson.build b/examples/meson.build index 04cbf744..d8df0bfc 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -1,9 +1,14 @@ 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() +endif executable('simple', 'simple.c', dependencies: wlroots) executable('pointer', 'pointer.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', |