X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=ba3c1eb9354eb188f28062cd0c55372f373bfd0b;hb=ba90df334784ba6a0a6b81e70da121c3d67f58a3;hp=5d1ab941e2b9270d1f38d31553893dfd7394109e;hpb=81f641b93bf76bb92c70b0babd6701897dc05d7a;p=dcpomatic.git

diff --git a/cscript b/cscript
index 5d1ab941e..ba3c1eb93 100644
--- a/cscript
+++ b/cscript
@@ -325,17 +325,20 @@ def dependencies(target):
 
     if target.platform == 'windows' and target.version == 'xp':
         deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
-    else:
+    elif target.platform != 'linux' or target.distro != 'arch':
         deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)]
+    else:
+        # Use distro-provided FFmpeg on Arch
+        deps = []
 
-    deps.append(('libdcp', '5d8a158'))
-    deps.append(('libsub', '7adea71'))
+    deps.append(('libdcp', '6ff5bc5'))
+    deps.append(('libsub', 'd4b8b95'))
     deps.append(('rtaudio-cdist', '739969e'))
 
     return deps
 
 def option_defaults():
-    return { "gui": True }
+    return { "gui": True, "variant": None }
 
 def configure_options(target, options):
     opt = ''
@@ -360,6 +363,9 @@ def configure_options(target, options):
     if not options['gui']:
         opt += ' --disable-gui'
 
+    if options['variant'] is not None:
+        opt += ' --variant=%s' % options['variant']
+
     # Build Windows debug versions with static linking as I think gdb works better then
     if target.debug and target.platform == 'windows':
         opt += ' --static-dcpomatic'
@@ -591,9 +597,11 @@ def make_appimage(target, nice_name, internal_name, version):
     with open('build/%s.AppDir/%s.desktop' % (nice_filename, internal_name), 'w') as f:
         print('[Desktop Entry]', file=f)
         print('Type=Application', file=f)
+        print('Categories=AudioVideo;', file=f)
         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))