From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue, 5 Nov 2019 16:11:55 +0000 (+0530)
Subject: vpx: Error out if enabled and no features found
X-Git-Tag: 1.16.2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=093f8a12c9b33f498e487eb1a2a55d70cafb7b43;hp=54c1aa8db647bda90b4794a51e3510d02b338bc0;p=platform%2Fupstream%2Fgst-plugins-good.git

vpx: Error out if enabled and no features found

See: https://gitlab.freedesktop.org/gstreamer/cerbero/issues/200
---

diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build
index 0d2340b..27acdf4 100644
--- a/ext/vpx/meson.build
+++ b/ext/vpx/meson.build
@@ -16,7 +16,8 @@ vpx_features = [
   [ 'vpx/vp8dx.h', 'vpx_codec_vp9_dx_algo', '-DHAVE_VP9_DECODER', 'VP9 decoder' ],
 ]
 
-vpx_dep = dependency('vpx', version : '>=1.3.0', required : get_option('vpx'))
+vpx_option = get_option('vpx')
+vpx_dep = dependency('vpx', version : '>=1.3.0', required : vpx_option)
 
 if vpx_dep.found()
   vpx_args = []
@@ -41,7 +42,13 @@ if vpx_dep.found()
   endforeach
 
   if vpx_args.length() == 0
-    message('WARNING: libvpx was built without any encoder or decoder features!')
+    msg = 'libvpx was built without any encoder or decoder features!'
+    # Error out if explicitly enabled, but continue with a warning if the
+    # plugin is in auto-detect mode to reduce build-time friction.
+    if vpx_option.enabled()
+      error(msg)
+    endif
+    warning(msg)
   endif
 
   if dependency('vpx', version : '>=1.4.0', required : false).found()