projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 69aa855aaef8a5f98c09aed1007aae9f13823a69..180c27bd13ad0c2cef92651246642d51135c040f 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-290,8
+290,8
@@
def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
ffmpeg_options = {}
return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
- ('libdcp', '
0c70427
'),
- ('libsub', '
7f6828
1'),
+ ('libdcp', '
1daf081
'),
+ ('libsub', '
567a71
1'),
('rtaudio-cdist', None))
def configure_options(target):
('rtaudio-cdist', None))
def configure_options(target):
@@
-308,6
+308,11
@@
def configure_options(target):
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
opt += ' --workaround-gssapi'
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
opt += ' --workaround-gssapi'
+ # Centos 7 ships with glibmm 2.50.0 which requires C++11
+ # but its compiler (gcc 4.8.5) defaults to C++97. Go figure.
+ # I worry that this will cause ABI problems but I don't have
+ # a better solution.
+ opt += ' --force-cpp11'
# Build Windows debug versions with static linking as I think gdb works better then
if target.debug and target.platform == 'windows':
# Build Windows debug versions with static linking as I think gdb works better then
if target.debug and target.platform == 'windows':