Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0

diff --git a/cscript b/cscript
index da540aeb7b61a5223d4ae1cf5018cf3c58fb85b1..1e42377bbc1446a22e7b1ff7c82cbc216b84287a 100644 (file)
--- a/cscript
+++ b/cscript
@@ -7,7 +7,7 @@ def dependencies(target):
         return ()
     else:
         return (('ffmpeg-cdist', '61d7015f7c79f97e9af00bacedc856e195538a44'),
-                ('libdcp', 'v0.75'))
+                ('libdcp', 'v0.78'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()

diff --git a/wscript b/wscript
index 915b41d24405a5dbc53a1d7ee1f97a8e8518e5aa..b2aa634b9a7ed5d19df151d0a3a778ac3f3218e8 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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.75', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
+    conf.check_cfg(package='libdcp',        atleast_version='0.78', 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)