X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=6427db78d6c29499d3cf835b6044847bad8ae35d;hp=06bf0eb51c69fe187169939aae63c224b14d9f37;hb=24ee3601c560da006b268f0a2514dfc4125c87cd;hpb=47d83b296248119d04b9226fd51a67e2fd3faac5

diff --git a/cscript b/cscript
index 06bf0eb51..6427db78d 100644
--- a/cscript
+++ b/cscript
@@ -32,6 +32,9 @@ 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']:
+    deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+    deb_build_depends[v].extend(['libssh-dev', 'python3.10'])
 for v in ['9', '10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python'])
@@ -117,6 +120,25 @@ deb_depends['21.10'].extend(['libboost-filesystem1.74.0',
                              'libnanomsg5',
                              'libdav1d4'])
 
+deb_depends['22.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['22.04'].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',
+                             'libicu67',
+                             'libnettle8',
+                             'libssh-4',
+                             'libx264-160',
+                             'libcurl4',
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg5',
+                             'libdav1d4'])
+
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libboost-thread1.62.0',
@@ -303,6 +325,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)
@@ -317,6 +340,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)
@@ -341,6 +365,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)
@@ -402,8 +427,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.10'))
-    deps.append(('libsub', 'v1.6.10'))
+    deps.append(('libdcp', 'c4c176e9d3bd72fe1746f22d7afb442ca72a72f2'))
+    deps.append(('libsub', '079cf6179c1a41284858feaf61c6e57384d72777'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -730,6 +755,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:
@@ -761,6 +787,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