X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=c36f880d462af9e3e337325c6705636e8f3c5b0a;hb=3ee5431c7e270d7bf706fcf7530a6eb2c78480c3;hp=afcad4b3977e9fcf5b9930c0907d98e1af7babbb;hpb=b120dfb4818ba797a33a88792f45ea6adbb331a3;p=dcpomatic.git

diff --git a/cscript b/cscript
index afcad4b39..c36f880d4 100644
--- a/cscript
+++ b/cscript
@@ -33,10 +33,10 @@ deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['16.04'].extend(['libssh-dev'])
 deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['18.04'].extend(['libssh-dev'])
-deb_build_depends['19.10'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['19.10'].extend(['libssh-dev'])
 deb_build_depends['20.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['20.04'].extend(['libssh-dev'])
+deb_build_depends['20.10'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['20.10'].extend(['libssh-dev'])
 deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['9'].extend(['libssh-gcrypt-dev'])
 deb_build_depends['10'] = copy.deepcopy(deb_build_depends_base)
@@ -84,18 +84,18 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libxerces-c3.2',
                              'libnanomsg4'])
 
-deb_depends['19.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
-                             'libboost-thread1.67.0',
-                             'libboost-regex1.67.0',
-                             'libboost-date-time1.67.0',
+deb_depends['20.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
+                             'libboost-thread1.71.0',
+                             'libboost-regex1.71.0',
+                             'libboost-date-time1.71.0',
                              'libcairomm-1.0-1v5',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
                              'libzip5',
-                             'libwxgtk3.0-0v5',
-                             'libicu63',
-                             'libnettle6',
+                             'libwxgtk3.0-gtk3-0v5',
+                             'libicu66',
+                             'libnettle7',
                              'libssh-4',
                              'libx264-155',
                              'libcurl4',
@@ -103,8 +103,8 @@ deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
                              'libxerces-c3.2',
                              'libnanomsg5'])
 
-deb_depends['20.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
+deb_depends['20.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['20.10'].extend(['libboost-filesystem1.71.0',
                              'libboost-thread1.71.0',
                              'libboost-regex1.71.0',
                              'libboost-date-time1.71.0',
@@ -197,7 +197,7 @@ def can_build_disk(target):
     if target.platform == 'osx':
         return True
     if target.platform == 'linux':
-        if target.distro == 'ubuntu' and target.version in ['18.04', '19.10', '20.04']:
+        if target.distro == 'ubuntu' and target.version in ['18.04', '20.04', '20.10']:
             return True
         if target.distro == 'debian' and target.version == '10':
             return True
@@ -286,6 +286,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_player', file=f)
     print('%{_bindir}/dcpomatic2_playlist', file=f)
     print('%{_bindir}/dcpomatic2_openssl', file=f)
+    print('%{_bindir}/dcpomatic2_combiner', file=f)
     if options['variant'] == 'swaroop-studio':
         print('%{_bindir}/dcpomatic2_ecinema', file=f)
         print('%{_bindir}/dcpomatic2_uuid', file=f)
@@ -298,7 +299,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f)
-    print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_combiner.desktop', file=f)
     if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
         print('%{_datadir}/applications/dcpomatic2_disk.desktop', file=f)
     print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f)
@@ -323,6 +324,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.png' % r, file=f)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_combiner.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', 'tr_TR']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
@@ -362,9 +364,7 @@ def dependencies(target, options):
     else:
         ffmpeg_options = {}
 
-    if target.platform == 'windows' and target.version == 'xp':
-        deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
-    elif target.platform != 'linux' or target.distro != 'arch':
+    if target.platform != 'linux' or target.distro != 'arch':
         deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
@@ -375,8 +375,8 @@ def dependencies(target, options):
             (target.platform == 'osx' and target.bits == 64) or
             (target.platform == 'windows')) else {}
 
-    deps.append(('libdcp', '184bdd2', cpp_lib_options))
-    deps.append(('libsub', '72bf4fc', cpp_lib_options))
+    deps.append(('libdcp', '9d1c856', cpp_lib_options))
+    deps.append(('libsub', '1b52b38', cpp_lib_options))
     deps.append(('leqm-nrt', 'carl'))
     deps.append(('rtaudio', 'carl'))
     # We get our OpenSSL libraries from the environment, but we