projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp for KDM optional tag fix.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 3824603ec0826809a310ea55e11cc21d523673e4..e5c91a540c12ffff20dddb6f2b12095fe465d516 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-44,7
+44,8
@@
deb_depends['12.04'] = {'libc6': '2.15',
'libxmlsec1-openssl': '1.2.14-1.2build1',
'libboost-date-time1.48.0': '1.48.0-3',
'libcurl3': '7.22.0-3ubuntu4',
'libxmlsec1-openssl': '1.2.14-1.2build1',
'libboost-date-time1.48.0': '1.48.0-3',
'libcurl3': '7.22.0-3ubuntu4',
- 'libzip2': '0.10-1ubuntu1'}
+ 'libzip2': '0.10-1ubuntu1',
+ 'libsamplerate0': '0.1.8-4'}
deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
'libssh-4': '0.6.1-0ubuntu3',
deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
'libssh-4': '0.6.1-0ubuntu3',
@@
-60,7
+61,7
@@
deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
'libboost-date-time1.54.0': '1.54.0-4ubuntu3',
'libcurl3': '7.35.0-1ubuntu2',
'libzip2': '0.10.1-1.2',
'libboost-date-time1.54.0': '1.54.0-4ubuntu3',
'libcurl3': '7.35.0-1ubuntu2',
'libzip2': '0.10.1-1.2',
- 'libs
oxr0': '0.1.1-1
'}
+ 'libs
amplerate0': '0.1.8-7
'}
deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
'libssh-4': '0.6.3-3ubuntu3',
deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
'libssh-4': '0.6.3-3ubuntu3',
@@
-77,7
+78,7
@@
deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
'libcurl3': '7.38.0-3ubuntu2',
'libzip2': '0.11.2-1.2',
'libwxgtk3.0-0': '3.0.2-1',
'libcurl3': '7.38.0-3ubuntu2',
'libzip2': '0.11.2-1.2',
'libwxgtk3.0-0': '3.0.2-1',
- 'libs
oxr0': '0.1.1-1
'}
+ 'libs
amplerate0': '0.1.8-8
'}
deb_depends['7'] = {'libc6': '2.13',
'libssh-4': '0.5.4',
deb_depends['7'] = {'libc6': '2.13',
'libssh-4': '0.5.4',
@@
-94,7
+95,8
@@
deb_depends['7'] = {'libc6': '2.13',
'libcurl3': '7.26.0',
'libzip2': '0.10.1',
'libcairomm-1.0-1': '1.10.0-1',
'libcurl3': '7.26.0',
'libzip2': '0.10.1',
'libcairomm-1.0-1': '1.10.0-1',
- 'libpangomm-1.4-1': '2.28.4-1'}
+ 'libpangomm-1.4-1': '2.28.4-1',
+ 'libsamplerate0': '0.1.8-5'}
deb_depends['8'] = {'libc6': '2.19-18',
'libssh-4': '0.6.3-4',
deb_depends['8'] = {'libc6': '2.19-18',
'libssh-4': '0.6.3-4',
@@
-113,7
+115,7
@@
deb_depends['8'] = {'libc6': '2.19-18',
'libwxgtk3.0-0': '3.0.2',
'libxcb-xfixes0': '1.10',
'libxcb-shape0': '1.10',
'libwxgtk3.0-0': '3.0.2',
'libxcb-xfixes0': '1.10',
'libxcb-shape0': '1.10',
- 'libs
oxr0': '0.1.1-1
'}
+ 'libs
amplerate0': '0.1.8-8
'}
deb_depends['unstable'] = {'libc6': '2.13',
'libssh-4': '0.5.4',
deb_depends['unstable'] = {'libc6': '2.13',
'libssh-4': '0.5.4',
@@
-129,8
+131,7
@@
deb_depends['unstable'] = {'libc6': '2.13',
'libxmlsec1-openssl': '1.2.18',
'libcurl3': '7.26.0',
'libzip2': '0.10.1',
'libxmlsec1-openssl': '1.2.18',
'libcurl3': '7.26.0',
'libzip2': '0.10.1',
- 'libsoxr0': '0.1.1-1'}
-
+ 'libsamplerate0': '0.1.8-8'}
def packages(name, packages, f):
s = '%s: ' % name
def packages(name, packages, f):
s = '%s: ' % name
@@
-243,10
+244,10
@@
def dependencies(target):
ffmpeg_options = { 'shared': False }
else:
ffmpeg_options = {}
ffmpeg_options = { 'shared': False }
else:
ffmpeg_options = {}
-
- return (('ffmpeg-cdist', '
2e977e1
', ffmpeg_options),
- ('libdcp', '
v1.2.3
'),
- ('libsub', '
v1.1.4
'))
+
+ return (('ffmpeg-cdist', '
0e27b2b
', ffmpeg_options),
+ ('libdcp', '
068f2bd
'),
+ ('libsub', '
96796ad
'))
def configure_options(target):
opt = ''
def configure_options(target):
opt = ''
@@
-261,7
+262,7
@@
def configure_options(target):
if target.version == '6.5':
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
if target.version == '6.5':
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
- opt += ' --workaround-gssapi'
+ opt += ' --workaround-gssapi
--static-xmlpp
'
return opt
return opt