projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7a4c916
)
Bump libdcp/libsub to release versions.
author
Carl Hetherington
<cth@carlh.net>
Sun, 24 Apr 2016 23:55:24 +0000
(
00:55
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 24 Apr 2016 23:55:24 +0000
(
00:55
+0100)
cscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index b2968f02cb90b2dd02cddcdb0154532f8f7c691a..e6d89fdcaca2ec575901a3a138964289b92093c0 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-229,8
+229,8
@@
def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
ffmpeg_options = {}
return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
- ('libdcp', '
d926e11
'),
- ('libsub', '
b9fb00d
'))
+ ('libdcp', '
v1.3.3
'),
+ ('libsub', '
v1.1.12
'))
def configure_options(target):
opt = ''
def configure_options(target):
opt = ''
diff --git
a/wscript
b/wscript
index 1f875366bdc35cb8eb5e48c093a6ca326cbfca50..58aac8a1b59f9aeeac08c0903c08e57a36c0b71e 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-237,21
+237,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.3.
2
', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.
3
', 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.3.
2
', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.
3
', 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.1.1
1
', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.1
2
', 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.1.1
1
', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.1
2
', 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++