Don't emit black to fill up to a frame that we're not going to emit.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 8a4e605ca22457241296d185b700a3f79c3ef6a1..9be358723d2bc2661f3f018d1322c42f9165282c 100644 (file)
--- a/cscript
+++ b/cscript
@@ -42,6 +42,8 @@ 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['9'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['9'].extend(['libssh-gcrypt-dev'])
 deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
 
 deb_depends = dict()
@@ -140,16 +142,29 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libssh-4',
                          'libx264-142'])
 
+deb_depends['9'] = copy.deepcopy(deb_depends_base)
+deb_depends['9'].extend(['libboost-filesystem1.62.0',
+                         'libboost-thread1.62.0',
+                         'libboost-regex1.62.0',
+                         'libboost-date-time1.62.0',
+                         'libmagick++-6.q16-7',
+                         'libxml++2.6-2v5',
+                         'libgtk2.0-0',
+                         'libzip4',
+                         'libicu57',
+                         'libnettle6',
+                         'libx264-148'])
+
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
-deb_depends['unstable'].extend(['libboost-filesystem1.58.0',
-                                'libboost-thread1.58.0',
-                                'libboost-regex1.58.0',
-                                'libmagick++-6.q16-5v5',
+deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
+                                'libboost-thread1.62.0',
+                                'libboost-regex1.62.0',
+                                'libboost-date-time1.62.0',
+                                'libmagick++-6.q16-7',
                                 'libxml++2.6-2v5',
                                 'libgtk2.0-0',
-                                'libboost-date-time1.58.0',
-                                'libzip2',
-                                'libicu52',
+                                'libzip4',
+                                'libicu57',
                                 'libnettle6',
                                 'libx264-148'])
 
@@ -280,8 +295,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'd993f38', ffmpeg_options),
-            ('libdcp', 'c871326'),
-            ('libsub', 'ce09e4e'),
+            ('libdcp', 'a6a4c47'),
+            ('libsub', '83d90be'),
             ('rtaudio-cdist', None))
 
 def configure_options(target):
@@ -348,10 +363,10 @@ 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', '16.10', '17.04', '8', 'unstable']:
-        target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
-    else:
+    if target.version in ['14.04']:
         target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')
+    else:
+        target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
 
     target.command('dpkg-buildpackage -uc -us')