From e40ba71824aa5dfe2bf669cf07cb80af90dc9d0a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 19 Aug 2019 11:03:00 +0100 Subject: [PATCH] vpx: avoid confusing meson configure output when checking for vpx versions Used to print: |Run-time dependency vpx found: YES 1.7.0 |Message: libvpx provides VP8 encoder interface (vpx_codec_vp8_cx_algo) |Message: libvpx provides VP8 decoder interface (vpx_codec_vp8_dx_algo) |Message: libvpx provides VP9 encoder interface (vpx_codec_vp9_cx_algo) |Message: libvpx provides VP9 decoder interface (vpx_codec_vp9_dx_algo) |Dependency vpx found: YES (cached) |Dependency vpx found: NO found '1.7.0' but need: '>=1.8.0' |Run-time dependency vpx found: NO (tried pkgconfig and cmake) We can check the version of the found dep in a way that doesn't produce this confusing output. --- ext/vpx/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build index b6c94d6..67a713b 100644 --- a/ext/vpx/meson.build +++ b/ext/vpx/meson.build @@ -44,11 +44,13 @@ if vpx_dep.found() message('WARNING: libvpx was built without any encoder or decoder features!') endif - if dependency('vpx', version : '>=1.4.0', required : false).found() + if vpx_dep.version().version_compare('>= 1.4.0') + message('Found vpx >= 1.4.0') vpx_args += '-DHAVE_VPX_1_4' endif - if dependency('vpx', version : '>=1.8.0', required : false).found() + if vpx_dep.version().version_compare('>= 1.8.0') + message('Found vpx >= 1.8.0') vpx_args += '-DHAVE_VPX_1_8' endif -- 2.7.4