diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-25 16:22:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-25 16:22:20 +0100 |
| commit | c911df5915b258ee47b0e8952c5e4573b1fbaa76 (patch) | |
| tree | 96660aad9ae076a0d6c4ec677597c5e536203c77 | |
| parent | 290daefb79ec399cf7ba54968fc7e92e375e98d6 (diff) | |
| parent | 04cd0a32435fd4a5f136b45cae1007c7eeafd0f3 (diff) | |
Merge branch '1.0' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic into 1.0
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | wscript | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), - ('libdcp', 'v0.69')) + ('libdcp', 'v0.70')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() @@ -86,7 +86,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.69', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.70', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) |
