Bump ffmpeg version.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index c1afbabf891158de3a91bca4cdbaf3874842c636..875b590d129869b08436cdf3493a911c56c924e9 100644 (file)
--- a/cscript
+++ b/cscript
@@ -3,8 +3,8 @@ import shutil
 import os
 
 def dependencies(target):
-    return (('ffmpeg-cdist', 'b1219246a0cce9a4b916669d506bb33c925225c3'),
-            ('libdcp', '9394dad74a8439f8230eb6aa21b639f3e10cbb2a'))
+    return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'),
+            ('libdcp', '658695856029c7ae80e3556d07a1a5cb1b51cf1d'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -59,7 +59,7 @@ def package(target, version):
 
         return debs
     elif target.platform == 'osx':
-        target.command('bash platform/osx/make_dmg.sh')
+        target.command('bash platform/osx/make_dmg.sh %s' % target.work_dir_cscript())
         return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])
 
 def make_pot(target):
@@ -71,4 +71,5 @@ def make_pot(target):
 def make_manual(target):
     os.chdir('doc/manual')
     target.command('make')
-    return [os.path.abspath('pdf'), os.path.abspath('html')]
+    target.command('pdflatex colour.tex')
+    return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')]