Backport of c75484af73d38b00a4f27143f8e434b6f25bf355 from master; fix for overlaid...

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 82d332ba8133e17bbd6a5773147505b646a72c4b..c818229b508825242cf4ad314c57657b51ddfb9f 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -46,7 +46,7 @@ deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
 
 deb_depends = dict()
 
-deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0']
+deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libgtk2.0-0']
 
 deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
@@ -61,7 +61,8 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
                              'libicu52',
                              'libnettle4',
                              'libssh-4',
-                             'libx264-142'])
+                             'libx264-142',
+                             'libcurl3'])
 
 deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
@@ -77,7 +78,8 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libicu55',
                              'libnettle6',
                              'libssh-4',
-                             'libx264-148'])
+                             'libx264-148',
+                             'libcurl3'])
 
 deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
 deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
@@ -91,7 +93,8 @@ deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
                              'libicu57',
                              'libnettle6',
                              'libssh-4',
-                             'libx264-148'])
+                             'libx264-148',
+                             'libcurl3'])
 
 deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
@@ -107,22 +110,24 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libicu60',
                              'libnettle6',
                              'libssh-4',
-                             'libx264-152'])
+                             'libx264-152',
+                             'libcurl4'])
 
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
-                             'libboost-thread1.49.0',
-                             'libboost-regex1.49.0',
-                             'libmagick++5',
-                             'libxml++2.6-2',
-                             'libboost-date-time1.49.0',
-                             'libzip2',
-                             'libcairomm-1.0-1',
-                             'libpangomm-1.4-1',
-                             'libicu48',
-                             'libnettle4',
-                             'libnotify4',
-                             'libx264-123'])
+                         'libboost-thread1.49.0',
+                         'libboost-regex1.49.0',
+                         'libmagick++5',
+                         'libxml++2.6-2',
+                         'libboost-date-time1.49.0',
+                         'libzip2',
+                         'libcairomm-1.0-1',
+                         'libpangomm-1.4-1',
+                         'libicu48',
+                         'libnettle4',
+                         'libnotify4',
+                         'libx264-123',
+                         'libcurl3'])
 
 deb_depends['8'] = copy.deepcopy(deb_depends_base)
 deb_depends['8'].extend(['libboost-filesystem1.55.0',
@@ -140,7 +145,8 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libicu52',
                          'libnettle4',
                          'libssh-4',
-                         'libx264-142'])
+                         'libx264-142',
+                         'libcurl3'])
 
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
@@ -162,7 +168,8 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libssh-gcrypt-4',
                          'libnettle6',
                          'libx264-148',
-                         'libpulse0'])
+                         'libpulse0',
+                         'libcurl3'])
 
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
 deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
@@ -175,7 +182,8 @@ deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
                                 'libzip4',
                                 'libicu57',
                                 'libnettle6',
-                                'libx264-148'])
+                                'libx264-148',
+                                'libcurl3'])
 
 def packages(name, packages, f):
     s = '%s: ' % name
@@ -252,6 +260,7 @@ def make_spec(filename, version, target, requires=None):
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f)
     print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
@@ -263,7 +272,7 @@ def make_spec(filename, version, target, requires=None):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.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', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'ar_LB']:
+    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'ar_LB', 'el_GR']:
         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)
@@ -301,9 +310,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
-            ('libdcp', '92d0468'),
-            ('libsub', '708eff1'),
+    return (('ffmpeg-cdist', 'a92889b', ffmpeg_options),
+            ('libdcp', 'v1.5.5'),
+            ('libsub', 'v1.3.5'),
             ('rtaudio-cdist', '739969e'))
 
 def configure_options(target):
@@ -388,7 +397,7 @@ def package_debian(target, cpu, version):
 
     return debs
 
-def package_rpm(target, cpu, version, requires):
+def package_rpm(target, cpu, version):
     topdir = os.path.realpath('build/rpmbuild')
     os.makedirs('%s/BUILD' % topdir)
     os.makedirs('%s/RPMS' % topdir)