projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index af3921e2f742535f192b12e805649de1c51e27a2..2ac5fea9128a267aa7b6c2d22bc8e58eaec1cf25 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-157,7
+157,7
@@
def make_control(debian_version, bits, filename, debug):
def dependencies(target):
return (('ffmpeg-cdist', '67dc770'),
def dependencies(target):
return (('ffmpeg-cdist', '67dc770'),
- ('libdcp', '
7103135
'))
+ ('libdcp', '
1.0
'))
def build(target, options):
cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
def build(target, options):
cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@
-169,7
+169,10
@@
def build(target, options):
if target.version == 'unstable':
cmd += ' --debian-unstable'
elif target.distro == 'centos':
if target.version == 'unstable':
cmd += ' --debian-unstable'
elif target.distro == 'centos':
- cmd += ' --target-centos'
+ if target.version == '6.5':
+ cmd += ' --target-centos-6 --disable-tests'
+ elif target.version == '7':
+ cmd += ' --target-centos-7'
target.command(cmd)
target.command('./waf')
target.command(cmd)
target.command('./waf')