projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
59bc8df
)
Bump libdcp for fix to #1650.
author
Carl Hetherington
<cth@carlh.net>
Mon, 11 Nov 2019 20:26:40 +0000
(21:26 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 11 Nov 2019 20:26:40 +0000
(21:26 +0100)
cscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 4c965456f594734afe5a5c27ae4e0555a1a3e468..7d71949c41f1d8342a37a4ce2a309b1986bf4ff9 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-344,8
+344,8
@@
def dependencies(target):
# Use distro-provided FFmpeg on Arch
deps = []
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.6.1
0
'))
- deps.append(('libsub', 'v1.4.1
2
'))
+ deps.append(('libdcp', 'v1.6.1
1
'))
+ deps.append(('libsub', 'v1.4.1
3
'))
deps.append(('rtaudio-cdist', 'bf0fc23'))
return deps
deps.append(('rtaudio-cdist', 'bf0fc23'))
return deps
diff --git
a/wscript
b/wscript
index a7e5688e53be4426fcecb62b42ea31f860f3dbb3..1f9ac22736bc42f585e2ca5c72e440f87d74eaf7 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-313,21
+313,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.1
0
', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.1
1
', 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.1
0
', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.1
1
', 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.1
2
', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.4.1
3
', 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.1
2
', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.4.1
3
', 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++