summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-03 11:51:22 +0100
committerwm4 <wm4@nowhere>2015-03-03 11:56:44 +0100
commit5808f1c408be958e90a302f42610fc59dfa0c373 (patch)
tree3f059ce2235a100b7294a697b20dd167aced4353 /wscript
parent7031335886606714d8c2209984bc837530b2ba2d (diff)
downloadmpv-5808f1c408be958e90a302f42610fc59dfa0c373.tar.bz2
mpv-5808f1c408be958e90a302f42610fc59dfa0c373.tar.xz
build: bump required FFmpeg/Libav libraries
The af_lavrresample commit made compilation fail on Libav 10, so I think it's time to require somewhat more recent dependencies. Libav 11 is the latest release, and FFmpeg 2.4 seems to correspond to Libav 11. So use these. Also adjust the configure failure message. Instead of (accidentally) printing the pkg-config versions twice, print the release version numbers too. This is helpful, because the release version numbers are completely different from the pkg-config ones. I will probably remove some compatibility hacks in the following commits too.
Diffstat (limited to 'wscript')
-rw-r--r--wscript19
1 files changed, 10 insertions, 9 deletions
diff --git a/wscript b/wscript
index f273388305..c8a9fcafc9 100644
--- a/wscript
+++ b/wscript
@@ -370,11 +370,12 @@ iconv support use --disable-iconv.",
]
libav_pkg_config_checks = [
- 'libavutil', '>= 52.48.101',
- 'libavcodec', '>= 55.34.1',
- 'libavformat', '>= 55.12.0',
- 'libswscale', '>= 2.1.2'
+ 'libavutil', '>= 54.02.0',
+ 'libavcodec', '>= 56.1.0',
+ 'libavformat', '>= 56.01.0',
+ 'libswscale', '>= 2.1.3'
]
+libav_versions_string = "FFmpeg 2.4 or Libav 11"
libav_dependencies = [
{
@@ -383,15 +384,15 @@ libav_dependencies = [
'func': check_pkg_config(*libav_pkg_config_checks),
'req': True,
'fmsg': "Unable to find development files for some of the required \
-Libav libraries ({0}). Aborting.".format(" ".join(libav_pkg_config_checks))
+FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_string)
}, {
'name': '--libswresample',
'desc': 'libswresample',
- 'func': check_pkg_config('libswresample', '>= 0.17.104'),
+ 'func': check_pkg_config('libswresample', '>= 1.1.100'),
}, {
'name': '--libavresample',
'desc': 'libavresample',
- 'func': check_pkg_config('libavresample', '>= 1.1.0'),
+ 'func': check_pkg_config('libavresample', '>= 2.1.0'),
'deps_neg': ['libswresample'],
}, {
'name': 'resampler',
@@ -403,11 +404,11 @@ Libav libraries ({0}). Aborting.".format(" ".join(libav_pkg_config_checks))
}, {
'name': '--libavfilter',
'desc': 'libavfilter',
- 'func': check_pkg_config('libavfilter', '>= 3.90.100'),
+ 'func': check_pkg_config('libavfilter', '>= 5.0.0'),
}, {
'name': '--libavdevice',
'desc': 'libavdevice',
- 'func': check_pkg_config('libavdevice', '>= 54.0.0'),
+ 'func': check_pkg_config('libavdevice', '>= 55.0.0'),
}, {
'name': 'avcodec-chroma-pos-api',
'desc': 'libavcodec avcodec_enum_to_chroma_pos API',