Stub player.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 6fbe957847ccbe1df5fa542684d09aea8566f6b6..6fe9678b0f295cf068292f046bd732248aacaaa6 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', '5fce90f', ffmpeg_options),
+            ('libdcp', '047d8ff'),
+            ('libsub', '678962c'),
             ('rtaudio-cdist', None))
 
 def configure_options(target):
@@ -308,11 +308,11 @@ def configure_options(target):
     elif target.platform == 'linux':
         opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':
-            opt += ' --static-xmlsec --static-ssh --disable-tests'
+            opt += ' --disable-tests'
             if target.version == '6.5':
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
-                opt += ' --workaround-gssapi --static-xmlpp'
+                opt += ' --workaround-gssapi'
 
     # Build Windows debug versions with static linking as I think gdb works better then
     if target.debug and target.platform == 'windows':
@@ -363,7 +363,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 ['14.04']:
+    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')