projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to fix intermittent deadlocks with encoding servers.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 69cb9b3ad9b6745c27bafbbcc399824b3fe9b5ff..ef7306aed28c4b790e67178394f7449bf0e78299 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-236,9
+236,9
@@
def dependencies(target):
else:
ffmpeg_options = {}
else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', '
aab2fb1
', ffmpeg_options),
- ('libdcp', '
fe3bb91
'),
- ('libsub', '
d848eed
'))
+ return (('ffmpeg-cdist', '
1d4a1a4
', ffmpeg_options),
+ ('libdcp', '
v1.3.4
'),
+ ('libsub', '
v1.1.13
'))
def configure_options(target):
opt = ''
def configure_options(target):
opt = ''
@@
-337,7
+337,10
@@
def package_rpm(target, cpu, version):
if cpu == "amd64":
cpu = "x86_64"
else:
if cpu == "amd64":
cpu = "x86_64"
else:
- cpu = "i686"
+ if target.distro == 'centos' and target.version == '5':
+ cpu = "i386"
+ else:
+ cpu = "i686"
print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu))
for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu))
for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):