Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --combined cscript
index bc1a96be005ded3632d60a35737298f80bd5d71a,dc8a419d951a4c41b7d3d7a46f1a64a2cb7242f7..fdcdc11ea30a055b1a39519ff1fafbdc0e34f989
--- 1/cscript
--- 2/cscript
+++ b/cscript
@@@ -331,14 -331,14 +331,14 @@@ def dependencies(target)
          # Use distro-provided FFmpeg on Arch
          deps = []
  
-     deps.append(('libdcp', 'ee05b1c'))
-     deps.append(('libsub', '1cf5cdf'))
+     deps.append(('libdcp', '9eb185c'))
+     deps.append(('libsub', '04d5701'))
      deps.append(('rtaudio-cdist', '739969e'))
  
      return deps
  
  def option_defaults():
 -    return { "player-only": False, "gui": True, "variant": None }
 +    return { "gui": True, "variant": None }
  
  def configure_options(target, options):
      opt = ''
@@@ -363,6 -363,9 +363,6 @@@
      if not options['gui']:
          opt += ' --disable-gui'
  
 -    if options['player-only']:
 -        opt += ' --player-only'
 -
      if options['variant'] is not None:
          opt += ' --variant=%s' % options['variant']
  
@@@ -601,6 -604,7 +601,7 @@@ def make_appimage(target, nice_name, in
          print('Name=%s' % nice_name, file=f)
          print('Icon=%s' % internal_name, file=f)
      target.command('cp graphics/linux/256/%s.png build/%s.AppDir' % (internal_name, nice_filename))
+     target.command('linuxdeploy-x86_64.AppImage --appdir build/%s.AppDir' % nice_filename)
      target.command('appimagetool-x86_64.AppImage build/%s.AppDir' % nice_filename)
      target.command('mv %s-x86_64.AppImage build/%s-%s-x86_64.AppImage' % (nice_filename, nice_filename, version))
      return os.path.abspath('build/%s-%s-x86_64.AppImage' % (nice_filename, version))