From: Carl Hetherington Date: Sun, 3 Oct 2021 20:29:35 +0000 (+0200) Subject: Require libdcp v1.8.0 to fix SMPTE sub XML namespaces (#2061). X-Git-Tag: v2.15.166~6 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d5a23469a72d4ed995394e8da9768a23859dc43c;hp=2bf0a8aa3c5274b663b23caf74fc2b36be20cdfe Require libdcp v1.8.0 to fix SMPTE sub XML namespaces (#2061). --- diff --git a/cscript b/cscript index b6d00b8ce..0f205c086 100644 --- a/cscript +++ b/cscript @@ -431,7 +431,7 @@ def dependencies(target, options): # 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')) diff --git a/wscript b/wscript index e2cf96938..7eb247da0 100644 --- a/wscript +++ b/wscript @@ -302,12 +302,12 @@ def configure(conf): # 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.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