projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 379936677b71391e71ad208a7f28a244caa12d14..44f7bcd8fece494618ba2262e9231e4d3945bfb2 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', '
23a1a03
'))
+ return (('ffmpeg-cdist', '
1d4a1a4
', ffmpeg_options),
+ ('libdcp', '
b487f83
'),
+ ('libsub', '
45b8f2f
'))
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)):