X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=0ea227eddf6c56d11aded56bbc35d3c641308a78;hb=9c9890b9ff89af710db21145c03a09993c629e3e;hp=90cbbecfbc6c309cfa3ca145d064bfb106e4cab3;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab;p=dcpomatic.git

diff --git a/cscript b/cscript
index 90cbbecfb..0ea227edd 100644
--- a/cscript
+++ b/cscript
@@ -8,7 +8,6 @@ deb_build_depends = {'debhelper': '8.0.0',
                      'pkg-config': '0.26',
                      'libssh-dev': '0.5.2',
                      'libsndfile1-dev': '1.0.25',
-                     'libmagick++-dev': '8:6.6.9.7',
                      'libgtk2.0-dev': '2.24.10'}
 
 deb_depends = dict()
@@ -156,11 +155,14 @@ def make_control(debian_version, bits, filename, debug):
         print >>f,''
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '7e95caa'),
-            ('libdcp', '1.0'))
+    return (('ffmpeg-cdist', 'f69bb08'),
+            ('libdcp', 'b223c57'),
+            ('libsub', 'f66b11f'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
+    if target.debug:
+        cmd += ' --enable-debug'
     if target.platform == 'windows':
         cmd += ' --target-windows'
     elif target.platform == 'linux':
@@ -172,7 +174,7 @@ def build(target, options):
             if target.version == '6.5':
                 cmd += ' --target-centos-6 --disable-tests'
             elif target.version == '7':
-                cmd += ' --target-centos-7'
+                cmd += ' --target-centos-7 --disable-tests'
 
     target.command(cmd)
     target.command('./waf')
@@ -185,6 +187,7 @@ def package_windows(target):
     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~%%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.directory, target.bits))
+    target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, 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)
@@ -208,7 +211,7 @@ def package_debian(target, cpu, version):
     target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH'))
     if target.version == 'unstable':
         target.set('CDIST_EXTRA_CONFIGURE', '--debian-unstable')
-    target.command('dpkg-buildpackage')
+    target.command('dpkg-buildpackage -uc -us')
     
     debs = []
     for p in glob.glob('../*.deb'):