X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=a5bf45554b8a62a0c55bb42f2de3c6bf236e9a0b;hb=85f38d1d20f291d8cf453edb2d19afa06bdf2dde;hp=a17152d07da68d35b447d7ed6e7b893e2bb92f87;hpb=599d1c3c08ff1c901e1cf9194ba82a1ed0ad6797;p=dcpomatic.git

diff --git a/cscript b/cscript
index a17152d07..a5bf45554 100644
--- a/cscript
+++ b/cscript
@@ -208,7 +208,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', '20.04', '20.10']:
+        if target.distro == 'ubuntu' and target.version in ['18.04', '20.04', '20.10', '21.04']:
             return True
         if target.distro == 'debian' and target.version == '10':
             return True
@@ -386,8 +386,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'b68a460'))
-    deps.append(('libsub', '9c530ee'))
+    deps.append(('libdcp', '6384002'))
+    deps.append(('libsub', '55ebde1'))
     deps.append(('leqm-nrt', '131f971'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -642,10 +642,12 @@ def package_rpm(target, cpu, version, options):
 
     return rpms
 
-def make_appimage(target, nice_name, internal_name, version):
+def make_appimage(target, nice_name, internal_name, version, extra_bin=None):
     nice_filename = nice_name.replace(' ', '_')
     os.makedirs('build/%s.AppDir/usr/bin' % nice_filename)
     target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename))
+    if extra_bin:
+        target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, extra_bin, nice_filename))
     target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename))
     target.command('cp %s/bin/dcpverify build/%s.AppDir/usr/bin/dcpomatic2_verify' % (target.directory, nice_filename))
     target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename)
@@ -687,7 +689,7 @@ def package(target, version, options):
             out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version))
             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 Disk Writer', 'dcpomatic2_disk', version))
+            out.append(make_appimage(target, 'DCP-o-matic Disk Writer', 'dcpomatic2_disk', version, "dcpomatic2_disk_writer"))
             out.append(make_appimage(target, 'DCP-o-matic Combiner', 'dcpomatic2_combiner', version))
             return out
         else: