X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=c38528143f07926c54ab64557a8eea65272fe149;hb=027b55a0b00c075d11798421ce4dd648225769aa;hp=51c5f214699976c621a67f7995ccf6a59b228c28;hpb=2a6726e6f7287becc09286d6c0251630527fac4f;p=dcpomatic.git

diff --git a/cscript b/cscript
index 51c5f2146..c38528143 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', '8940450'))
-    deps.append(('libsub', '1bc45ae'))
+    deps.append(('libdcp', 'ee05b1c'))
+    deps.append(('libsub', '1cf5cdf'))
     deps.append(('rtaudio-cdist', '739969e'))
 
     return deps
 
 def option_defaults():
-    return { "gui": True }
+    return { "player-only": False, "gui": True, "variant": None }
 
 def configure_options(target, options):
     opt = ''
@@ -360,6 +363,12 @@ def configure_options(target, options):
     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']
+
     # 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,6 +600,7 @@ 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))