Go back to merged main branches of libdcp and rtaudio.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 405be1563ef0e254740de207cd51aba515de2959..c87cca371eebf8643b21f26a6aeecf92521c3806 100644 (file)
--- a/cscript
+++ b/cscript
@@ -294,9 +294,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'd993f38', ffmpeg_options),
-            ('libdcp', 'a6a4c47'),
-            ('libsub', '83d90be'),
+    return (('ffmpeg-cdist', 'mxe', ffmpeg_options),
+            ('libdcp', '37ad399'),
+            ('libsub', '40686a2'),
             ('rtaudio-cdist', None))
 
 def configure_options(target):
@@ -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')