Musings.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 3b66c83416fdfcf087456dcb1ee0f4a14ecf2181..6203a1042b2237d31414e785a3ede1a070f3bb29 100644 (file)
--- a/cscript
+++ b/cscript
@@ -66,6 +66,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',
@@ -232,9 +244,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
-            ('libdcp', '0acd045'),
-            ('libsub', '3db5052'))
+    return (('ffmpeg-cdist', 'c7df8d5', ffmpeg_options),
+            ('libdcp', 'v1.4.4'),
+            ('libsub', 'v1.2.4'))
 
 def configure_options(target):
     opt = ''
@@ -300,7 +312,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')
@@ -364,7 +376,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')