X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=feb46ae1f12b1a768df8ef67e5fda3bc3d1f18ff;hb=ea379128f9a89ea47660140af4a59efc88498901;hp=4e3939d7649f4b5b750b81b51725cbbe037cdbbb;hpb=80ce3f0bfcc13a403b22c888c28bcee10f125ece;p=dcpomatic.git

diff --git a/cscript b/cscript
index 4e3939d76..feb46ae1f 100644
--- a/cscript
+++ b/cscript
@@ -24,11 +24,27 @@ import shutil
 import os
 import copy
 
-deb_build_depends = {'debhelper', 'python', 'g++', 'pkg-config', 'libssh-dev', 'libsndfile1-dev', 'libgtk2.0-dev'}
+deb_build_depends = dict()
+
+deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev']
+
+deb_build_depends['12.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['12.04'].extend(['libssh-dev'])
+deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['14.04'].extend(['libssh-dev'])
+deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['16.04'].extend(['libssh-dev'])
+deb_build_depends['16.10'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['16.10'].extend(['libssh-dev'])
+deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['7'].extend(['libssh-dev'])
+deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['8'].extend(['libssh-dev'])
+deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
 
 deb_depends = dict()
 
-deb_depends_base = ['libc6', 'libssh-4', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0']
+deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0']
 
 deb_depends['12.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['12.04'].extend(['libboost-filesystem1.48.0',
@@ -39,7 +55,8 @@ deb_depends['12.04'].extend(['libboost-filesystem1.48.0',
                              'libboost-date-time1.48.0',
                              'libzip2',
                              'libicu48',
-                             'libnettle4'])
+                             'libnettle4',
+                             'libssh-4'])
 
 deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
@@ -52,7 +69,8 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
                              'libcairomm-1.0-1',
                              'libpangomm-1.4-1',
                              'libicu52',
-                             'libnettle4'])
+                             'libnettle4',
+                             'libssh-4'])
 
 deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
@@ -64,7 +82,21 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libzip4',
                              'libwxgtk3.0-0v5',
                              'libicu55',
-                             'libnettle6'])
+                             'libnettle6',
+                             'libssh-4'])
+
+deb_depends['16.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['16.10'].extend(['libboost-filesystem1.61.0',
+                             'libboost-thread1.61.0',
+                             'libboost-regex1.61.0',
+                             'libmagick++-6.q16-5v5',
+                             'libxml++2.6-2v5',
+                             'libboost-date-time1.61.0',
+                             'libzip4',
+                             'libwxgtk3.0-0v5',
+                             'libicu57',
+                             'libnettle6',
+                             'libssh-4'])
 
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
@@ -92,7 +124,8 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libxcb-xfixes0',
                          'libxcb-shape0',
                          'libicu52',
-                         'libnettle4'])
+                         'libnettle4',
+                         'libssh-4'])
 
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
 deb_depends['unstable'].extend(['libboost-filesystem1.58.0',
@@ -118,7 +151,7 @@ def make_control(debian_version, bits, filename, debug):
     print('Section: video', file=f)
     print('Priority: extra', file=f)
     print('Maintainer: Carl Hetherington <carl@dcpomatic.com>', file=f)
-    packages('Build-Depends', deb_build_depends, f)
+    packages('Build-Depends', deb_build_depends[debian_version], f)
     print('Standards-Version: 3.9.3', file=f)
     print('Homepage: http://dcpomatic.com/', file=f)
     print('', file=f)
@@ -232,9 +265,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
-            ('libdcp', '62da6ba'),
-            ('libsub', '067c21c'))
+    return (('ffmpeg-cdist', 'c7df8d5', ffmpeg_options),
+            ('libdcp', '71f5d09'),
+            ('libsub', 'v1.2.4'))
 
 def configure_options(target):
     opt = ''
@@ -251,6 +284,10 @@ def configure_options(target):
             elif target.version == '7':
                 opt += ' --workaround-gssapi --static-xmlpp'
 
+    # Build Windows debug versions with static linking as I think gdb works better then
+    if target.debug and target.platform == 'windows':
+        opt += ' --static-dcpomatic'
+
     return opt
 
 def build(target, options):
@@ -296,7 +333,7 @@ def package_debian(target, cpu, version):
     target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"')
     if target.debug:
         target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
-    if target.version in ['15.04', '15.10', '16.04', '8']:
+    if target.version in ['15.04', '15.10', '16.04', '16.10', '8', 'unstable']:
         target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
     else:
         target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')
@@ -360,7 +397,7 @@ def package(target, version):
             return package_rpm(target, cpu, version)
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
-        return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])
+        return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
 
 def make_pot(target):
     target.command('./waf pot')