diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-11-26 15:10:29 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-11-26 15:10:29 +0000 |
| commit | 71f5d09991c8c6362484075f9317e5cb9efd8e4c (patch) | |
| tree | 53e0b57f1cc18f28a1b1ca2eafb66818e7123a6b | |
| parent | b03e9d487b95c65f05e8a9806be94bc0bee57b53 (diff) | |
| parent | fef6c4b1f5e9ff7150dc5163bd3494e4bd64556f (diff) | |
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | wscript | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -35,9 +35,9 @@ import os def dependencies(target): if target.platform == 'windows' and target.version == 'xp': - return (('libcxml', 'v0.15.4'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', '162963e')) + return (('libcxml', 'v0.15.4'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', 'v0.1.3')) else: - return (('libcxml', 'v0.15.4'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', '162963e')) + return (('libcxml', 'v0.15.4'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.3')) def build(target, options): cmd = './waf configure --disable-examples --prefix=%s' % target.directory @@ -38,7 +38,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'libdcp' -VERSION = '1.4.3devel' +VERSION = '1.4.4devel' API_VERSION = '-1.0' def options(opt): @@ -114,7 +114,7 @@ def configure(conf): elif conf.options.jpeg == 'oj1': conf.check_cfg(package='libopenjpeg1', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) conf.env.STLIB_OPENJPEG = ['openjpeg'] - conf.check_cfg(package='libasdcp-cth', atleast_version='0.0.1', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.3', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) conf.env.HAVE_ASDCPLIB_CTH = 1 conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-cth', 'kumu-cth'] conf.env.HAVE_CXML = 1 @@ -125,7 +125,7 @@ def configure(conf): conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) elif conf.options.jpeg == 'oj1': conf.check_cfg(package='libopenjpeg1', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) - conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.0', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) conf.check_cfg(package='libcxml', atleast_version='0.15.2', args='--cflags --libs', uselib_store='CXML', mandatory=True) if conf.options.target_windows: |