Bump ffmpeg version.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 6a9b48a891368493a33371dc326c0babdbed6320..875b590d129869b08436cdf3493a911c56c924e9 100644 (file)
--- a/cscript
+++ b/cscript
@@ -3,12 +3,8 @@ import shutil
 import os
 
 def dependencies(target):
-    if target.platform == 'windows':
-        return ()
-    else:
-       # XXX: should be some versions in here
-        return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'),
-                ('libdcp', 'v0.54'))
+    return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'),
+            ('libdcp', '658695856029c7ae80e3556d07a1a5cb1b51cf1d'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -28,7 +24,8 @@ def package(target, version):
     if target.platform == 'windows':
         shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits)
         target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
-        target.command('sed -i "s~%%deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits))
+        target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits))
+        target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.work_dir_cscript(), target.bits))
         target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
         target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits)
         target.command('makensis build/platform/windows/installer2.%s.nsi' % target.bits)
@@ -42,14 +39,14 @@ def package(target, version):
         shutil.copyfile('platform/linux/control-%s-%d' % (target.version, target.bits), 'debian/control')
         target.command('./waf dist')
         f = open('debian/files', 'w')
-        print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu)
+        print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu)
         shutil.rmtree('build/deb', ignore_errors=True)
 
         os.makedirs('build/deb')
         os.chdir('build/deb')
-        shutil.move('../../dvdomatic-%s.tar.bz2' % version, 'dvdomatic_%s.orig.tar.bz2' % version)
-        target.command('tar xjf dvdomatic_%s.orig.tar.bz2' % version)
-        os.chdir('dvdomatic-%s' % version)
+        shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version)
+        target.command('tar xjf dcpomatic_%s.orig.tar.bz2' % version)
+        os.chdir('dcpomatic-%s' % version)
         target.command('dch -b -v %s-1 "New upstream release."' % version)
         target.set('CDIST_LINKFLAGS', target.get('LINKFLAGS'))
         target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS'))
@@ -62,16 +59,17 @@ def package(target, version):
 
         return debs
     elif target.platform == 'osx':
-        target.command('bash platform/osx/make_dmg.sh')
-        return os.path.abspath(glob.glob('build/platform/osx/DVD-o-matic*.dmg')[0])
+        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):
     target.command('./waf pot')
-    return [os.path.abspath('build/src/lib/libdvdomatic.pot'),
-            os.path.abspath('build/src/wx/libdvdomatic-wx.pot'),
-           os.path.abspath('build/src/tools/dvdomatic.pot')]
+    return [os.path.abspath('build/src/lib/libdcpomatic.pot'),
+            os.path.abspath('build/src/wx/libdcpomatic-wx.pot'),
+           os.path.abspath('build/src/tools/dcpomatic.pot')]
 
 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')]