X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=2ce67238587634bef7c57a64a21cdebd5a57f883;hb=fbe2784c136fa1550815babfce89589f66b35a29;hp=55b4fcd553599d13006ab0cbee99734eacfd2f45;hpb=1aa877613d49306b5026a5471edaf51ba3921889;p=dcpomatic.git

diff --git a/cscript b/cscript
index 55b4fcd55..2ce672385 100644
--- a/cscript
+++ b/cscript
@@ -236,9 +236,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'aab2fb1', ffmpeg_options),
-            ('libdcp', 'a5bf0e4'),
-            ('libsub', '6825d70'))
+    return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
+            ('libdcp', '7e9ad08'),
+            ('libsub', '067c21c'))
 
 def configure_options(target):
     opt = ''
@@ -337,7 +337,10 @@ def package_rpm(target, cpu, version):
     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)):
@@ -378,7 +381,9 @@ def make_manual(target):
 def test(target, test):
     if target.platform != 'windows':
         target.set('LC_ALL', 'C')
-        if test is None:
-            target.command('run/tests')
-        else:
-            target.command('run/tests --run_test=%s' % test)
+        cmd = 'run/tests '
+        if target.debug:
+            cmd += '--backtrace '
+        if test is not None:
+            cmd += '--run_test=%s' % test
+        target.command(cmd)