X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=cscript;h=8606708c5a3e7b56672c3ecf0d83e24123f383ff;hb=eddf4bcedfc5274a91f199617731fed55ca86ff4;hp=c704a61515803905d1798701ac1320d8041263db;hpb=1ca0998a3c56aa4f9a8fd59cd284f29f5088f121;p=dcpomatic.git

diff --git a/cscript b/cscript
index c704a6151..8606708c5 100644
--- a/cscript
+++ b/cscript
@@ -24,7 +24,23 @@ 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()
 
@@ -66,6 +82,18 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libicu55',
                              'libnettle6'])
 
+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'])
+
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
                              'libboost-thread1.49.0',
@@ -118,7 +146,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 +260,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
-            ('libdcp', '3e24098'),
-            ('libsub', '067c21c'))
+    return (('ffmpeg-cdist', 'c7df8d5', ffmpeg_options),
+            ('libdcp', '71f5d09'),
+            ('libsub', 'v1.2.4'))
 
 def configure_options(target):
     opt = ''
@@ -251,6 +279,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 +328,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 +392,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')