From 61b46d101e95ce29c680082cc11ae72c7b80e045 Mon Sep 17 00:00:00 2001
From: Philip Langdale <philipl@overt.org>
Date: Sat, 21 Sep 2019 08:54:42 -0700
Subject: wscript: Fix test for ffmpeg drmprime support

This test requires libavutil headers but there is no avutil
dependency for it to use. So let's add one, and also reorder the
ffmpeg tests ahead of the video tests so that the avutil dependency
can be used.
---
 wscript | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/wscript b/wscript
index dfe551607b..d5d9ffd71f 100644
--- a/wscript
+++ b/wscript
@@ -448,6 +448,12 @@ libav_dependencies = [
         'func': check_pkg_config('libavcodec'),
         'req': True,
         'fmsg': "FFmpeg/Libav development files not found.",
+    }, {
+        'name': 'libavutil',
+        'desc': 'FFmpeg/Libav libavutil present',
+        'func': check_pkg_config('libavutil'),
+        'req': True,
+        'fmsg': "FFmpeg/Libav libavutil not found.",
     }, {
         'name': 'ffmpeg',
         'desc': 'libav* is FFmpeg',
@@ -558,7 +564,8 @@ video_output_features = [
         'name': '--drmprime',
         'desc': 'DRM Prime ffmpeg support',
         'func': check_statement('libavutil/pixfmt.h',
-                                'int i = AV_PIX_FMT_DRM_PRIME')
+                                'int i = AV_PIX_FMT_DRM_PRIME',
+                                use='libavutil')
     }, {
         'name': '--gbm',
         'desc': 'GBM',
@@ -1009,9 +1016,9 @@ def configure(ctx):
 
     ctx.parse_dependencies(build_options)
     ctx.parse_dependencies(main_dependencies)
+    ctx.parse_dependencies(libav_dependencies)
     ctx.parse_dependencies(audio_output_features)
     ctx.parse_dependencies(video_output_features)
-    ctx.parse_dependencies(libav_dependencies)
     ctx.parse_dependencies(hwaccel_features)
 
     if ctx.options.LUA_VER:
-- 
cgit v1.2.3