summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2016-06-11 12:44:38 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2016-06-11 12:44:38 +0200
commit9efb07c08ee9c32cfd86f00c3d1d1cb0e3078eab (patch)
tree42080b05198446f10bcbaac82a315d1b17506a9a
parentcea40de02cc971c0c6cdc6962391c1066410b957 (diff)
downloadmpv-fix-ffmpeg-build.tar.bz2
mpv-fix-ffmpeg-build.tar.xz
build: fix ffmpeg checksfix-ffmpeg-build
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'`
-rw-r--r--wscript6
1 files 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',