Bump ffmpeg to master somewhere post 3.0.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 81e617800bba39ec6f1e5bc90962321d83aaf2cb..14a48811fb63a33418925e6e56e2cd493bb6b264 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -68,24 +68,6 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libpangomm-1.4-1': '2.34.0-1ubuntu1',
                         'libicu52': '52.1-3'}
 
-deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
-                        'libssh-4': '0.6.3-3ubuntu3',
-                        'libboost-filesystem1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libboost-thread1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libboost-regex1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libsndfile1': '1.0.25-9.1',
-                        'libmagick++-6.q16-5': '8:6.8.9.9-5',
-                        'libxml++2.6-2': '2.36.0-2.1',
-                        'libgtk2.0-0': '2.24.27-0ubuntu1',
-                        'libxmlsec1': '1.2.20-2ubuntu2',
-                        'libxmlsec1-openssl': '1.2.20-2ubuntu2',
-                        'libboost-date-time1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libcurl3': '7.38.0-3ubuntu2',
-                        'libzip2': '0.11.2-1.2',
-                        'libwxgtk3.0-0': '3.0.2-1',
-                        'libsamplerate0': '0.1.8-8',
-                        'libicu52': '52.1-8'}
-
 deb_depends['15.10'] = {'libc6': '2.21-0ubuntu4',
                         'libssh-4': '0.6.3-3ubuntu3',
                         'libboost-filesystem1.58.0': '1.58.0+dfsg-3.1ubuntu1',
@@ -243,7 +225,7 @@ def make_spec(filename, version, target):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f)
-    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'sk_SK', 'cs_CZ']:
+    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'sk_SK', 'cs_CZ', 'uk_UA']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
@@ -279,9 +261,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '96d67de', ffmpeg_options),
-            ('libdcp', '4e38f82'),
-            ('libsub', '9cefa0f'))
+    return (('ffmpeg-cdist', '1ebd1c8', ffmpeg_options),
+            ('libdcp', 'v1.3.1'),
+            ('libsub', 'v1.1.11'))
 
 def configure_options(target):
     opt = ''