projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f5b6241
)
Bump libsub for Centos build fix.
author
Carl Hetherington
<cth@carlh.net>
Fri, 28 Jun 2019 23:05:08 +0000
(
00:05
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 28 Jun 2019 23:05:08 +0000
(
00:05
+0100)
cscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 64959b2d2639184689e84e3e66a00b9ad35392da..d58f8e4d3d40bc956037f98e13fe5e2b627f98c9 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-352,7
+352,7
@@
def dependencies(target):
deps = []
deps.append(('libdcp', 'v1.6.8'))
deps = []
deps.append(('libdcp', 'v1.6.8'))
- deps.append(('libsub', 'v1.4.
9
'))
+ deps.append(('libsub', 'v1.4.
10
'))
deps.append(('rtaudio-cdist', 'bf0fc23'))
return deps
deps.append(('rtaudio-cdist', 'bf0fc23'))
return deps
diff --git
a/wscript
b/wscript
index 0f6c22228757360adadcf098f5ae088c06b05f81..c6bcba56ad62ba2893af174c62f70ec4c47165ad 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-315,11
+315,11
@@
def configure(conf):
# libsub
if conf.options.static_sub:
# libsub
if conf.options.static_sub:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.4.
9
', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.4.
10
', 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.
9
', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.4.
10
', 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++