diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-04-29 19:34:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-04-29 19:34:13 +0100 |
| commit | 034feb503b0a38eb82c21ae8d9f83522fc63a25c (patch) | |
| tree | 499351fff1f42f3629f3d2101a7ba40d35681818 /wscript | |
| parent | 63fb96f0e513fe3209cc2947f77baa961d76de05 (diff) | |
| parent | a080b67c77ef9f379540028ed01d7ad43ab3184f (diff) | |
Merge master.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -44,12 +44,12 @@ def dynamic_ffmpeg(conf): def static_openjpeg(conf): conf.check_cfg(package='libopenjpeg', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) - conf.check_cfg(package='libopenjpeg', args='--cflags', max_version='1.5.1', mandatory=True) + conf.check_cfg(package='libopenjpeg', args='--cflags', max_version='1.5.2', mandatory=True) conf.env.STLIB_OPENJPEG = ['openjpeg'] def dynamic_openjpeg(conf): conf.check_cfg(package='libopenjpeg', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) - conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.1', mandatory=True) + conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True) def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): conf.check_cfg(package='libdcp-1.0', atleast_version='0.92', args='--cflags', uselib_store='DCP', mandatory=True) |