Merge branch 'master' into staging

2 files changed, 4 insertions, 2 deletions

diff --git a/cscript b/cscript
index 8280ae526..417e4221c 100644
--- a/cscript
+++ b/cscript
@@ -6,7 +6,9 @@ def dependencies(target):
     if target.platform == 'windows':
         return ()
     else:
-        return ('openjpeg-cdist', 'ffmpeg-cdist', 'libdcp')
+        return (('openjpeg-cdist', None),
+                ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa'),
+                ('libdcp', 'v0.45'))
 
 def build(env, target):
     cmd = './waf configure --prefix=%s' % env.work_dir_cscript()
diff --git a/wscript b/wscript
index 10c06a74d..5b0babd90 100644
--- a/wscript
+++ b/wscript
@@ -55,7 +55,7 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-O2')
 
     if not conf.options.static:
-        conf.check_cfg(package = 'libdcp', atleast_version = '0.41', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
+        conf.check_cfg(package = 'libdcp', atleast_version = '0.45', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
         conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
         conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)
         conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)