diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-15 20:39:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-15 20:39:47 +0000 |
| commit | 816b3c2dda2c5e33900f5d90a001284045040b5f (patch) | |
| tree | e6f80be308f26dfdf2bb2e1996755315c075c72f /wscript | |
| parent | c9f11d1367a54313e61abbaef7c075ed336b7f79 (diff) | |
| parent | 5d3ebbb2e7844485e8dddd6471209d56b05633ae (diff) | |
Merge master.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.66.0devel' +VERSION = '1.66.1devel' def options(opt): opt.load('compiler_cxx') @@ -33,8 +33,6 @@ def static_ffmpeg(conf): conf.env.STLIB_SWSCALE = ['swscale'] conf.check_cfg(package='libswresample', args='--cflags', uselib_store='SWRESAMPLE', mandatory=True) conf.env.STLIB_SWRESAMPLE = ['swresample'] - conf.check_cfg(package='libpostproc', args='--cflags', uselib_store='POSTPROC', mandatory=True) - conf.env.STLIB_POSTPROC = ['postproc'] def dynamic_ffmpeg(conf): conf.check_cfg(package='libavformat', args='--cflags --libs', uselib_store='AVFORMAT', mandatory=True) @@ -43,7 +41,6 @@ def dynamic_ffmpeg(conf): conf.check_cfg(package='libavutil', args='--cflags --libs', uselib_store='AVUTIL', mandatory=True) conf.check_cfg(package='libswscale', args='--cflags --libs', uselib_store='SWSCALE', mandatory=True) conf.check_cfg(package='libswresample', args='--cflags --libs', uselib_store='SWRESAMPLE', mandatory=True) - conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True) def static_openjpeg(conf): conf.check_cfg(package='libopenjpeg', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) |