projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d5a2346
)
Require libsub v1.6.0.
author
Carl Hetherington
<cth@carlh.net>
Sun, 3 Oct 2021 20:32:51 +0000
(22:32 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 3 Oct 2021 20:32:51 +0000
(22:32 +0200)
cscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 0f205c08684402176a0ebf476b3fbd6d9f9fb9bf..e864a294f8c08b40bc1da4a69b2254fbb1be0916 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-432,7
+432,7
@@
def dependencies(target, options):
deps = []
deps.append(('libdcp', 'v1.8.0'))
deps = []
deps.append(('libdcp', 'v1.8.0'))
- deps.append(('libsub', '
587e475
'))
+ deps.append(('libsub', '
v1.6.0
'))
deps.append(('leqm-nrt', '93ae9e6'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
deps.append(('leqm-nrt', '93ae9e6'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
diff --git
a/wscript
b/wscript
index 7eb247da087c42cfa5c848e790e6e0beb142c490..be944e817fe41d753b0f0cb7d0abdad565bb7b5d 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-312,11
+312,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.7
', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.
6.0
', 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.
6.0
', 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++