Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index d0e93036e1e132336e191dac5d0234e03e88ae8e..1e2bbeec63e74ce49f9e03111ce354e9d553aff6 100644 (file)
--- a/cscript
+++ b/cscript
@@ -41,7 +41,7 @@ deb_build_depends['17.04'].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['8'].extend(['libssh-gcrypt-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)
@@ -294,9 +294,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'd993f38', ffmpeg_options),
-            ('libdcp', 'a1d530b'),
-            ('libsub', '117c4d9'),
+    return (('ffmpeg-cdist', 'mxe', ffmpeg_options),
+            ('libdcp', '047d8ff'),
+            ('libsub', '4af2a09'),
             ('rtaudio-cdist', None))
 
 def configure_options(target):
@@ -363,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 ['16.04', '16.10', '17.04', '8', 'unstable']:
-        target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
-    else:
+    if target.version in ['7', '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')