From 9efb07c08ee9c32cfd86f00c3d1d1cb0e3078eab Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Sat, 11 Jun 2016 12:44:38 +0200
Subject: build: fix ffmpeg checks

Our build system executes each check in isolation to prevent issues where a
check passes incorrectly because all the build flags are available.

It's possible to bring in pkg-config flags from previous checks with `use`,
using the `name` of the check's dependency.

This commit forces both `recent-ffmpeg` and `unsupported-ffmpeg` to store
the pkg-config flags in the `ffmpeg` key, so that the ffmpeg checks can use
`'use': 'ffmpeg'`
---
 wscript | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wscript b/wscript
index 4b510f0c99..0e6cc45d07 100644
--- a/wscript
+++ b/wscript
@@ -409,11 +409,13 @@ ffmpeg_dependencies = [
     {
         'name': 'recent-ffmpeg',
         'desc': 'recent ffmpeg',
-        'func': check_pkg_config(*ffmpeg_pkg_config_checks),
+        'func': check_pkg_config(
+            *ffmpeg_pkg_config_checks, uselib_store = 'ffmpeg'),
     }, {
         'name': '--unsupported-ffmpeg',
         'desc': 'old libav/ffmpeg',
-        'func': check_pkg_config(*libav_pkg_config_checks),
+        'func': check_pkg_config(
+            *libav_pkg_config_checks, uselib_store = 'ffmpeg'),
         'default': 'disable',
     }, {
         'name': 'ffmpeg',
-- 
cgit v1.2.3