projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to speed up cancel of encoder threads if they are sleeping for remote backoff.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 51e87222a02e06e48d6ff049552758f5fb1abb20..298eda314ed76e808dc496adbc1978945773c5ef 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-149,7
+149,7
@@
deb_depends['unstable'] = {'libc6': '2.19-22',
'libboost-regex1.58.0': '1.58.0+dfsg-4',
'libsndfile1': '1.0.25-9.1',
'libmagick++-6.q16-5v5': '8:6.8.9.9-6',
'libboost-regex1.58.0': '1.58.0+dfsg-4',
'libsndfile1': '1.0.25-9.1',
'libmagick++-6.q16-5v5': '8:6.8.9.9-6',
- 'libxml++2.6-2
': '2.38
1-1',
+ 'libxml++2.6-2
v5': '2.40.
1-1',
'libgtk2.0-0': '2.24.28-1',
'libxmlsec1': '1.2.20-2+b2',
'libboost-date-time1.58.0': '1.58.0+dfsg-4',
'libgtk2.0-0': '2.24.28-1',
'libxmlsec1': '1.2.20-2+b2',
'libboost-date-time1.58.0': '1.58.0+dfsg-4',
@@
-278,9
+278,9
@@
def dependencies(target):
else:
ffmpeg_options = {}
else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', '
d0986a9
', ffmpeg_options),
- ('libdcp', '
dc31f6d
'),
- ('libsub', '
8364c00
'))
+ return (('ffmpeg-cdist', '
0e31e4b
', ffmpeg_options),
+ ('libdcp', '
c4db5b5
'),
+ ('libsub', '
bcb2263
'))
def configure_options(target):
opt = ''
def configure_options(target):
opt = ''
@@
-289,7
+289,7
@@
def configure_options(target):
if target.platform == 'windows':
opt += ' --target-windows'
elif target.platform == 'linux':
if target.platform == 'windows':
opt += ' --target-windows'
elif target.platform == 'linux':
- opt += ' --static-dcpomatic --static-
openjpeg --static-
wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
+ opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
if target.distro == 'centos':
opt += ' --static-xmlsec --static-ssh --disable-tests'
if target.version == '6.5':
if target.distro == 'centos':
opt += ' --static-xmlsec --static-ssh --disable-tests'
if target.version == '6.5':