projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merge.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index adafda00a0ce68bdca1f6c3884e84e50393748cd..1b87b5463b6c89b723d371210d7bda9cf779882a 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-67,7
+67,7
@@
deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
'libboost-date-time1.54.0',
'libzip2',
'libcairomm-1.0-1',
'libboost-date-time1.54.0',
'libzip2',
'libcairomm-1.0-1',
- 'libpangomm-1.4-1
',
+ 'libpangomm-1.4-1
,'
'libicu52',
'libnettle4',
'libssh-4'])
'libicu52',
'libnettle4',
'libssh-4'])
@@
-80,6
+80,8
@@
deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
'libxml++2.6-2v5',
'libboost-date-time1.58.0',
'libzip4',
'libxml++2.6-2v5',
'libboost-date-time1.58.0',
'libzip4',
+ 'libcairomm-1.0-1v5',
+ 'libpangomm-1.4-1v5',
'libwxgtk3.0-0v5',
'libicu55',
'libnettle6',
'libwxgtk3.0-0v5',
'libicu55',
'libnettle6',
@@
-268,8
+270,8
@@
def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', 'c7df8d5', ffmpeg_options),
ffmpeg_options = {}
return (('ffmpeg-cdist', 'c7df8d5', ffmpeg_options),
- ('libdcp', '
839bc2d
'),
- ('libsub', '
d557f39
'))
+ ('libdcp', '
a3032f3
'),
+ ('libsub', '
a04f1d5
'))
def configure_options(target):
opt = ''
def configure_options(target):
opt = ''