Require libdcp v1.8.0 to fix SMPTE sub XML namespaces (#2061).

diff --git a/cscript b/cscript
index b6d00b8ce601c9b0e121840fe27351c29e27f13e..0f205c08684402176a0ebf476b3fbd6d9f9fb9bf 100644 (file)
--- a/cscript
+++ b/cscript
@@ -431,7 +431,7 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
         # Use distro-provided FFmpeg on Arch
         deps = []
 

-    deps.append(('libdcp', 'b3cb9c0'))
+    deps.append(('libdcp', 'v1.8.0'))

     deps.append(('libsub', '587e475'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     deps.append(('libsub', '587e475'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))

diff --git a/wscript b/wscript
index e2cf96938d16f4d934e419d83fc24cf7c7e50869..7eb247da087c42cfa5c848e790e6e0beb142c490 100644 (file)
--- a/wscript
+++ b/wscript
@@ -302,12 +302,12 @@ def configure(conf):
 
     # libdcp
     if conf.options.static_dcp:
 
     # libdcp
     if conf.options.static_dcp:

-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.8.0', args='--cflags', uselib_store='DCP', mandatory=True)

         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
         conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c']
     else:
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
         conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c']
     else:

-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.8.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)

         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
 
     # libsub
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
 
     # libsub