projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c5f6716
)
Bump libdcp/libsub for fix to #1561 (problems when writing many SMPTE subs).
author
Carl Hetherington
<cth@carlh.net>
Tue, 21 May 2019 20:27:07 +0000
(21:27 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 21 May 2019 20:27:07 +0000
(21:27 +0100)
cscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 14d1829f115705dfb95f91d79bca075e3625b17c..a088c5de738bbf532f2a28438a86865dbb25af5a 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-351,8
+351,8
@@
def dependencies(target):
# Use distro-provided FFmpeg on Arch
deps = []
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.6.
7
'))
- deps.append(('libsub', 'v1.4.
7
'))
+ deps.append(('libdcp', 'v1.6.
8
'))
+ deps.append(('libsub', 'v1.4.
8
'))
deps.append(('rtaudio-cdist', 'bf0fc23'))
return deps
deps.append(('rtaudio-cdist', 'bf0fc23'))
return deps
diff --git
a/wscript
b/wscript
index 83ebc68576fff8bc87aa8da4facd2a08399d36a3..665fd7ac7ef52d2dafbfc4990f4240fc98d6a0d5 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-305,21
+305,21
@@
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.6.
8
', 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-cth', 'kumu-cth', 'openjp2']
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
else:
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2']
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
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.6.
8
', args='--cflags --libs', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
# libsub
if conf.options.static_sub:
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
# libsub
if conf.options.static_sub:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.4.
7
', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.4.
8
', args='--cflags', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
conf.env.STLIB_SUB = ['sub-1.0']
else:
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
conf.env.STLIB_SUB = ['sub-1.0']
else:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.4.
7
', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.4.
8
', args='--cflags --libs', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++