Fix font_id_map errors when importing DCP subtitles that have no

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 3ac340796d066ce6ebe2e55d3d6a4c0d532371c7..6cb19914df77addccdc0f67c7ae464ab40aef45c 100644 (file)
--- a/cscript
+++ b/cscript
@@ -32,7 +32,7 @@ deb_build_depends_base = ['debhelper', 'g++', 'pkg-config', 'libsndfile1-dev', '
 for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-dev', 'python'])
-for v in ['22.04']:
+for v in ['22.04', '22.10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-dev', 'python3.10'])
 for v in ['9', '10']:
@@ -129,15 +129,34 @@ deb_depends['22.04'].extend(['libboost-filesystem1.74.0',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
                              'libzip4',
-                             'libicu67',
+                             'libicu70',
                              'libnettle8',
                              'libssh-4',
-                             'libx264-160',
+                             'libx264-163',
                              'libcurl4',
                              'libpulse0',
                              'libxerces-c3.2',
                              'libnanomsg5',
-                             'libdav1d4'])
+                             'libdav1d5'])
+
+deb_depends['22.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['22.10'].extend(['libboost-filesystem1.74.0',
+                             'libboost-thread1.74.0',
+                             'libboost-regex1.74.0',
+                             'libboost-date-time1.74.0',
+                             'libcairomm-1.0-1v5',
+                             'libpangomm-1.4-1v5',
+                             'libxml++2.6-2v5',
+                             'libzip4',
+                             'libicu71',
+                             'libnettle8',
+                             'libssh-4',
+                             'libx264-164',
+                             'libcurl4',
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg5'])
+
 
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
@@ -325,6 +344,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_batch', file=f)
     print('%{_bindir}/dcpomatic2_cli', file=f)
     print('%{_bindir}/dcpomatic2_create', file=f)
+    print('%{_bindir}/dcpomatic2_editor', file=f)
     print('%{_bindir}/dcpomatic2_kdm', file=f)
     print('%{_bindir}/dcpomatic2_server', file=f)
     print('%{_bindir}/dcpomatic2_server_cli', file=f)
@@ -339,6 +359,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)
     print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_editor.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)
@@ -363,6 +384,7 @@ def make_spec(filename, version, target, options, requires=None):
     for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']:
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_editor.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)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
@@ -370,7 +392,7 @@ def make_spec(filename, version, target, options, requires=None):
         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']:
+              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'sl_SI', 'hu_HU']:
         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)
@@ -424,8 +446,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.16'))
-    deps.append(('libsub', 'v1.6.17'))
+    deps.append(('libdcp', 'v1.8.29'))
+    deps.append(('libsub', 'v1.6.32'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -434,7 +456,7 @@ def dependencies(target, options):
     # the appropriate place later
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
-        deps.append(('lwext4', 'cce3730'))
+        deps.append(('lwext4', 'ee865fa65f05e348cd4e0bce0552a2725ad5663a'))
     deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169'))
 
     return deps
@@ -752,6 +774,7 @@ def package(target, version, options):
             out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version))
             out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version))
             out.append(make_appimage(target, 'DCP-o-matic Combiner', 'dcpomatic2_combiner', version))
+            out.append(make_appimage(target, 'DCP-o-matic Editor', 'dcpomatic2_editor', version))
             return out
         else:
             if target.bits == 32:
@@ -764,8 +787,11 @@ def package(target, version, options):
             elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
                 return package_rpm(target, cpu, version, options)
     elif target.platform == 'osx':
-        archs = ' '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets)
-        target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs))
+        archs = '-a ' + ' -a '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets)
+        cmd = 'bash platform/osx/make_dmg.sh -e %s -r %s -i %s -p %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs)
+        if 'part' in options:
+            cmd += ' -b ' + options['part']
+        target.command(cmd)
         packages = []
         for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'):
             a = os.path.abspath(x)
@@ -783,6 +809,8 @@ def package(target, version, options):
                 packages.append((a, "com.dcpomatic.disk"))
             elif x.find("Combiner") != -1:
                 packages.append((a, "com.dcpomatic.combiner"))
+            elif x.find("Editor") != -1:
+                packages.append((a, "com.dcpomatic.editor"))
             else:
                 packages.append((a, "com.dcpomatic"))
         return packages
@@ -822,7 +850,7 @@ def test(target, options, test):
     if target.platform == 'windows':
         cmd = 'run\\tests '
     else:
-        cmd = 'run/tests '
+        cmd = 'run/tests --log_level=test_suite '
     if target.debug:
         cmd += '--backtrace '
     if test is not None: