X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=fdcdc11ea30a055b1a39519ff1fafbdc0e34f989;hb=e571e208d540a5bb6dafa49a8e91cb0428931abb;hp=0cfc31edbf5801a46d1177b95e193cff674d4f6b;hpb=96df54c7bd8ddbccafe3ec77edea3a6458f3268e;p=dcpomatic.git diff --git a/cscript b/cscript index 0cfc31edb..fdcdc11ea 100644 --- a/cscript +++ b/cscript @@ -331,14 +331,14 @@ def dependencies(target): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', '6fef005')) - deps.append(('libsub', '32b8463')) + deps.append(('libdcp', '9eb185c')) + deps.append(('libsub', '04d5701')) deps.append(('rtaudio-cdist', '739969e')) return deps def option_defaults(): - return { "gui": True } + return { "gui": True, "variant": None } def configure_options(target, options): opt = '' @@ -363,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' @@ -594,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))