Merge master.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 569b8a3da42d700fb932985fb2f7abbf59342567..b8b0580063ee0490652cd2c8e0b0132360bcf349 100644 (file)
--- a/cscript
+++ b/cscript
@@ -129,8 +129,8 @@ def make_control(debian_version, bits, filename, debug):
         print >>f,''
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'),
-            ('libdcp', 'a7dac85'))
+    return (('ffmpeg-cdist', '08827fa4e1d483511e6135c424d2ca9c56a9ed50'),
+            ('libdcp', '1.0'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -201,7 +201,11 @@ def package_centos(target, cpu, version):
 
     target.command('rpmbuild -bb build/platform/linux/dcpomatic.spec')
     rpms = []
-    for p in glob.glob('%s/rpmbuild/RPMS/x86_64/*.rpm' % target.work_dir_cdist()):
+
+    if cpu == "amd64":
+        cpu = "x86_64"
+
+    for p in glob.glob('%s/rpmbuild/RPMS/%s/*.rpm' % (target.work_dir_cdist(), cpu)):
         rpms.append(os.path.abspath(p))
 
     return rpms