Update waf and bump deps for similar updates.
[dcpomatic.git] / cscript
diff --git a/cscript b/cscript
index 9d89f4962b2f2cb19c58e6096cbfa67baafde33f..5f452b5bff24e569cef2fb3587a124465b7e07f5 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -23,6 +23,7 @@ import glob
 import shutil
 import os
 import copy
+import json
 
 deb_build_depends = dict()
 
@@ -32,10 +33,10 @@ deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['14.04'].extend(['libssh-dev'])
 deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['16.04'].extend(['libssh-dev'])
-deb_build_depends['17.10'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['17.10'].extend(['libssh-dev'])
 deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['18.04'].extend(['libssh-dev'])
+deb_build_depends['18.10'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['18.10'].extend(['libssh-dev'])
 deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['7'].extend(['libssh-dev'])
 deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
@@ -45,14 +46,14 @@ deb_build_depends['9'].extend(['libssh-gcrypt-dev'])
 deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
 
 deb_depends = dict()
+deb_depends_gui = dict()
 
-deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0']
+deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libgtk2.0-0']
 
 deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
                              'libboost-thread1.54.0',
                              'libboost-regex1.54.0',
-                             'libmagick++5',
                              'libxml++2.6-2',
                              'libboost-date-time1.54.0',
                              'libzip2',
@@ -61,13 +62,13 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
                              'libicu52',
                              'libnettle4',
                              'libssh-4',
-                             'libx264-142'])
+                             'libx264-142',
+                             'libcurl3'])
 
 deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libboost-thread1.58.0',
                              'libboost-regex1.58.0',
-                             'libmagick++-6.q16-5v5',
                              'libxml++2.6-2v5',
                              'libboost-date-time1.58.0',
                              'libzip4',
@@ -77,28 +78,30 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libicu55',
                              'libnettle6',
                              'libssh-4',
-                             'libx264-148'])
+                             'libx264-148',
+                             'libcurl3'])
 
-deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
-                             'libboost-thread1.62.0',
-                             'libboost-regex1.62.0',
-                             'libmagick++-6.q16-7',
+deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
+                             'libboost-thread1.65.1',
+                             'libboost-regex1.65.1',
+                             'libboost-date-time1.65.1',
+                             'libcairomm-1.0-1v5',
+                             'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
-                             'libboost-date-time1.62.0',
                              'libzip4',
                              'libwxgtk3.0-0v5',
-                             'libicu57',
+                             'libicu60',
                              'libnettle6',
                              'libssh-4',
-                             'libx264-148'])
+                             'libx264-152',
+                             'libcurl4'])
 
-deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
+deb_depends['18.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['18.10'].extend(['libboost-filesystem1.65.1',
                              'libboost-thread1.65.1',
                              'libboost-regex1.65.1',
                              'libboost-date-time1.65.1',
-                             'libmagick++-6.q16-7',
                              'libcairomm-1.0-1v5',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
@@ -107,29 +110,29 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libicu60',
                              'libnettle6',
                              'libssh-4',
-                             'libx264-152'])
+                             'libx264-152',
+                             'libcurl4'])
 
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
-                             'libboost-thread1.49.0',
-                             'libboost-regex1.49.0',
-                             'libmagick++5',
-                             'libxml++2.6-2',
-                             'libboost-date-time1.49.0',
-                             'libzip2',
-                             'libcairomm-1.0-1',
-                             'libpangomm-1.4-1',
-                             'libicu48',
-                             'libnettle4',
-                             'libnotify4',
-                             'libx264-123'])
+                         'libboost-thread1.49.0',
+                         'libboost-regex1.49.0',
+                         'libxml++2.6-2',
+                         'libboost-date-time1.49.0',
+                         'libzip2',
+                         'libcairomm-1.0-1',
+                         'libpangomm-1.4-1',
+                         'libicu48',
+                         'libnettle4',
+                         'libnotify4',
+                         'libx264-123',
+                         'libcurl3'])
 
 deb_depends['8'] = copy.deepcopy(deb_depends_base)
 deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libboost-thread1.55.0',
                          'libboost-date-time1.55.0',
                          'libboost-regex1.55.0',
-                         'libmagick++-6.q16-5',
                          'libxml++2.6-2',
                          'libzip2',
                          'libcairomm-1.0-1',
@@ -140,42 +143,44 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libicu52',
                          'libnettle4',
                          'libssh-4',
-                         'libx264-142'])
+                         'libx264-142',
+                         'libcurl3'])
 
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libboost-thread1.62.0',
                          'libboost-regex1.62.0',
                          'libboost-date-time1.62.0',
-                         'libmagick++-6.q16-7',
                          'libxml++2.6-2v5',
                          'libgtk2.0-0',
                          'libzip4',
                          'libcairomm-1.0-1v5',
                          'libpangomm-1.4-1v5',
-                         'libwxgtk3.0-0v5',
-                         'libxcb-xfixes0',
-                         'libxcb-shape0',
-                         'libasound2',
                          'libicu57',
                          'libssh-4',
                          'libssh-gcrypt-4',
                          'libnettle6',
                          'libx264-148',
-                         'libpulse0'])
+                         'libcurl3'])
+
+deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5',
+                         'libxcb-xfixes0',
+                         'libxcb-shape0',
+                         'libasound2',
+                         'libpulse0' ]
 
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
 deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
                                 'libboost-thread1.62.0',
                                 'libboost-regex1.62.0',
                                 'libboost-date-time1.62.0',
-                                'libmagick++-6.q16-7',
                                 'libxml++2.6-2v5',
                                 'libgtk2.0-0',
                                 'libzip4',
                                 'libicu57',
                                 'libnettle6',
-                                'libx264-148'])
+                                'libx264-148',
+                                'libcurl3'])
 
 def packages(name, packages, f):
     s = '%s: ' % name
@@ -183,7 +188,7 @@ def packages(name, packages, f):
         s += str(p) + ', '
     print(s[:-2], file=f)
 
-def make_control(debian_version, bits, filename, debug):
+def make_control(debian_version, bits, filename, debug, gui):
     f = open(filename, 'w')
     print('Source: dcpomatic', file=f)
     print('Section: video', file=f)
@@ -191,7 +196,7 @@ def make_control(debian_version, bits, filename, debug):
     print('Maintainer: Carl Hetherington <carl@dcpomatic.com>', file=f)
     packages('Build-Depends', deb_build_depends[debian_version], f)
     print('Standards-Version: 3.9.3', file=f)
-    print('Homepage: http://dcpomatic.com/', file=f)
+    print('Homepage: https://dcpomatic.com/', file=f)
     print('', file=f)
     print('Package: dcpomatic', file=f)
     if bits == 32:
@@ -199,7 +204,11 @@ def make_control(debian_version, bits, filename, debug):
     else:
         print('Architecture: amd64', file=f)
 
-    packages('Depends', deb_depends[debian_version], f)
+    pkg = deb_depends[debian_version]
+    if gui and debian_version in deb_depends_gui:
+        pkg.extend(deb_depends_gui[debian_version])
+
+    packages('Depends', pkg, f)
 
     print('Description: Generator of Digital Cinema Packages (DCPs)', file=f)
     print('  DCP-o-matic generates Digital Cinema Packages (DCPs) from videos, images,', file=f)
@@ -215,12 +224,12 @@ def make_control(debian_version, bits, filename, debug):
             print('Architecture: amd64', file=f)
         print('Section: debug', file=f)
         print('Priority: extra', file=f)
-        packages('Depends', deb_depends[debian_version], f)
+        packages('Depends', pkg, f)
         print('Description: debugging symbols for dcpomatic', file=f)
         print('  This package contains the debugging symbols for dcpomatic.', file=f)
         print('', file=f)
 
-def make_spec(filename, version, target, requires=None):
+def make_spec(filename, version, target, options, requires=None):
     """Make a .spec file for a RPM build"""
     f = open(filename, 'w')
     print('Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files', file=f)
@@ -229,14 +238,13 @@ def make_spec(filename, version, target, requires=None):
     print('Release:1%{?dist}', file=f)
     print('License:GPL', file=f)
     print('Group:Applications/Multimedia', file=f)
-    print('URL:http://dcpomatic.com/', file=f)
+    print('URL:https://dcpomatic.com/', file=f)
     if requires is not None:
         print('Requires:%s' % requires, file=f)
     print('', file=f)
     print('%description', file=f)
     print('DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio ', file=f)
-    print('files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant ', file=f)
-    print('digital projectors.', file=f)
+    print('files for presentation on DCI-compliant digital projectors.', file=f)
     print('', file=f)
     print('%files', file=f)
     print('%{_bindir}/dcpomatic2', file=f)
@@ -252,7 +260,16 @@ def make_spec(filename, version, target, requires=None):
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f)
     print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f)
+    print('%{_datadir}/dcpomatic2/select.png', file=f)
+    print('%{_datadir}/dcpomatic2/sequence.png', file=f)
+    print('%{_datadir}/dcpomatic2/snap.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_all.png', file=f)
+    print('%{_datadir}/dcpomatic2/tick.png', file=f)
+    print('%{_datadir}/dcpomatic2/no_tick.png', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f)
@@ -263,7 +280,8 @@ def make_spec(filename, version, target, requires=None):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
-    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'ar_LB']:
+    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK',
+              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'ar_LB', 'fi_FI', 'el_GR', 'tr_TR']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
@@ -276,7 +294,7 @@ def make_spec(filename, version, target, requires=None):
     print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig' % (target.directory, target.directory), file=f)
 
     print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' %
-          (target.directory, target.directory, configure_options(target)), file=f)
+          (target.directory, target.directory, configure_options(target, options)), file=f)
     print('./waf', file=f)
     print('%install', file=f)
     print('cd dcpomatic-%s' % version, file=f)
@@ -301,13 +319,30 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
-            ('libdcp', '623e197'),
-            ('libsub', 'debe9fb'),
-            ('rtaudio-cdist', '739969e'))
+    if target.platform == 'windows' and target.version == 'xp':
+        deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
+    elif target.platform != 'linux' or target.distro != 'arch':
+        deps = [('ffmpeg-cdist', 'a820b44', ffmpeg_options)]
+    else:
+        # Use distro-provided FFmpeg on Arch
+        deps = []
+
+    deps.append(('libdcp', 'a2feb49'))
+    deps.append(('libsub', '8bb11a3'))
+    deps.append(('rtaudio-cdist', 'aad62d7'))
 
-def configure_options(target):
+    return deps
+
+def option_defaults():
+    return { "gui": True, "variant": None }
+
+def configure_options(target, options):
     opt = ''
+
+    if not (target.platform == 'linux' and target.distro == 'ubuntu' and (target.version == '18.04' or target.version == '16.04')):
+        # Currently we only build tests on Ubuntu 1{6,8}.04
+        opt += ' --disable-tests'
+
     if target.debug:
         opt += ' --enable-debug'
     if target.platform == 'windows':
@@ -315,7 +350,6 @@ def configure_options(target):
     elif target.platform == 'linux':
         opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':
-            opt += ' --disable-tests'
             if target.version == '6.5':
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
@@ -326,6 +360,12 @@ def configure_options(target):
                 # a better solution.
                 opt += ' --force-cpp11'
 
+    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'
@@ -333,11 +373,126 @@ def configure_options(target):
     return opt
 
 def build(target, options):
-    target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target)))
-    target.command('./waf')
+    if target.platform == 'flatpak':
+        target.checkout_dependencies()
+        prefix = 'https://dcpomatic.com/deps'
+        modules = []
+        modules.append({'name': 'libzip',
+                        'buildsystem': 'cmake',
+                        'sources': [{'type': 'archive',
+                                     'url': '%s/libzip-1.4.0.tar.xz' % prefix,
+                                    'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]})
+        modules.append({'name': 'libsigc++',
+                        'sources': [{'type': 'archive',
+                                     'url': '%s/libsigc++-2.10.0.tar.xz' % prefix,
+                                     'sha256': 'f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81'}]})
+        modules.append({'name': 'glibmm',
+                        'sources': [{'type': 'archive',
+                                     'url': '%s/glibmm-2.48.1.tar.xz' % prefix,
+                                     'sha256': 'dc225f7d2f466479766332483ea78f82dc349d59399d30c00de50e5073157cdf'}]})
+        modules.append({'name': 'cairomm',
+                        'sources': [{'type': 'archive',
+                                     'url': '%s/cairomm-1.12.2.tar.gz' % prefix,
+                                     'sha256': '45c47fd4d0aa77464a75cdca011143fea3ef795c4753f6e860057da5fb8bd599'}]})
+        modules.append({'name': 'pangomm',
+                       'sources': [{'type': 'archive',
+                                    'url': '%s/pangomm-2.40.1.tar.xz' % prefix,
+                                    'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]})
+       modules.append({'name': 'libxml++',
+                       'sources': [{'type': 'archive',
+                                    'url': '%s/libxml++-2.40.1.tar.xz' % prefix,
+                                    'sha256': '4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9'}]})
+        modules.append({'name': 'xmlsec1',
+                       'sources': [{'type': 'archive',
+                                    'url': '%s/xmlsec1-1.2.25.tar.gz' % prefix,
+                                    'sha256': '967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2'}]})
+       modules.append({'name': 'openjpeg2',
+                       'buildsystem': 'cmake',
+                       'sources': [{'type': 'dir', 'path': os.path.abspath('../openjpeg2-cdist')}]})
+       modules.append({'name': 'boost',
+                       'buildsystem': 'simple',
+                       'build-commands': [
+                           './bootstrap.sh --prefix=/app',
+                           './b2 install'
+                       ],
+                       'sources': [{'type': 'archive',
+                                    'url': '%s/boost_1_66_0.tar.bz2' % prefix,
+                                    'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]})
+       modules.append({'name': 'asdcplib',
+                       'buildsystem': 'simple',
+                       'build-commands': [
+                           './waf configure --prefix=/app  --libdir=/app/lib build install'
+                       ],
+                       'sources': [{'type': 'dir', 'path': os.path.abspath('../asdcplib-cth')}]})
+       modules.append({'name': 'locked_sstream',
+                       'buildsystem': 'simple',
+                       'build-commands': [
+                           './waf configure --prefix=/app build install'
+                       ],
+                       'sources': [{'type': 'dir', 'path': os.path.abspath('../locked_sstream')}]})
+       modules.append({'name': 'libcxml',
+                       'buildsystem': 'simple',
+                       'build-commands': [
+                           './waf configure --prefix=/app  --libdir=/app/lib build install'
+                       ],
+                       'sources': [{'type': 'dir', 'path': os.path.abspath('../libcxml')}]})
+       modules.append({'name': 'libdcp',
+                       'buildsystem': 'simple',
+                       'build-commands': [
+                           './waf configure --prefix=/app --libdir=/app/lib build install'
+                       ],
+                       'sources': [{'type': 'dir', 'path': os.path.abspath('../libdcp')}]})
+       modules.append({'name': 'libsub',
+                       'buildsystem': 'simple',
+                       'build-commands': [
+                           './waf configure --prefix=/app --libdir=/app/lib build install'
+                       ],
+                       'sources': [{'type': 'dir', 'path': os.path.abspath('../libsub')}]})
+       modules.append({'name': 'rtaudio',
+                       'build-options': {
+                           'config-opts': [
+                               '--prefix=/app',
+                               '--with-pulse',
+                               '--with-alsa'
+                           ]
+                       },
+                       'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]})
+       modules.append({'name': 'wxwidgets',
+                       'sources': [{'type': 'archive',
+                                    'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix,
+                                    'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]})
+       modules.append({'name': 'libssh',
+                       'buildsystem': 'cmake',
+                       'builddir': True,
+                       'sources': [{'type': 'archive',
+                                    'url': '%s/libssh-0.7.5.tar.xz' % prefix,
+                                    'sha256': '54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'}]})
+       modules.append({'name': 'dcpomatic',
+                       'buildsystem': 'simple',
+                       'build-commands': [
+                           './waf configure --prefix=/app build install'
+                       ],
+                        'build-options': {
+                            'build-args': ['--share=network']
+                        },
+                       'sources': [{'type': 'dir', 'path': os.path.abspath('.')}]})
+        desc = {'app-id': 'com.dcpomatic.DCP-o-matic',
+                'runtime': 'org.gnome.Sdk',
+                'runtime-version': '3.26',
+                'sdk': 'org.gnome.Sdk',
+                'command': 'dcpomatic2',
+                'finish-args': ['--socket=x11', '--share=ipc', '--share=network', '--socket=pulseaudio', '--filesystem=host'],
+                'modules': modules}
+        os.makedirs('build/platform')
+        with open('build/com.dcpomatic.DCP-o-matic.json', 'w') as outfile:
+            json.dump(desc, outfile)
+        target.command('%s --repo=build/platform/repo build/platform/flatpak build/com.dcpomatic.DCP-o-matic.json' % target.flatpak_builder())
+    else:
+        target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
+        target.command('./waf')
 
-    if target.platform == 'linux' or target.platform == 'osx':
-        target.command('./waf install')
+        if target.platform == 'linux' or target.platform == 'osx':
+            target.command('./waf install')
 
 def package_windows(target):
     identifier = ''
@@ -355,8 +510,8 @@ def package_windows(target):
     target.command('makensis build/platform/windows/installer2.%s.nsi' % identifier)
     return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0])
 
-def package_debian(target, cpu, version):
-    make_control(target.version, target.bits, 'debian/control', target.debug)
+def package_debian(target, cpu, version, options):
+    make_control(target.version, target.bits, 'debian/control', target.debug, options['gui'])
     target.command('./waf dist')
     f = open('debian/files', 'w')
     print('dcpomatic_%s-1_%s.deb video extra' % (version, cpu), file=f)
@@ -372,7 +527,7 @@ def package_debian(target, cpu, version):
     target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS'))
     target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH'))
 
-    target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"')
+    target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"')
     if target.debug:
         target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
     if target.version in ['7', '14.04']:
@@ -388,8 +543,7 @@ def package_debian(target, cpu, version):
 
     return debs
 
-def package_rpm(target, cpu, version):
-    print('package_rpm %s %s %s' % (target, cpu, version))
+def package_rpm(target, cpu, version, options):
     topdir = os.path.realpath('build/rpmbuild')
     os.makedirs('%s/BUILD' % topdir)
     os.makedirs('%s/RPMS' % topdir)
@@ -406,8 +560,8 @@ def package_rpm(target, cpu, version):
     requires = None
     if target.distro == 'mageia':
         requires = "lib64xmlsec1-devel"
-    
-    make_spec('build/platform/linux/dcpomatic2.spec', version, target, requires)
+
+    make_spec('build/platform/linux/dcpomatic2.spec', version, target, options, requires)
     cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir
     target.command(cmd)
     rpms = []
@@ -417,26 +571,56 @@ def package_rpm(target, cpu, version):
     else:
         cpu = "i686"
 
-    print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu))
     for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
-        print('found %s' % p)
         rpms.append(os.path.abspath(p))
 
     return rpms
 
-def package(target, version):
+def make_appimage(target, nice_name, internal_name, version):
+    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))
+    with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f:
+        print('#!/bin/bash', file=f)
+        print('export APPDIR="$(dirname "$(readlink -f "$0")")"', file=f)
+        print('export PATH=$APPDIR/usr/bin:$PATH', file=f)
+        print('export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS"', file=f)
+        print('"$APPDIR"/usr/bin/%s $@' % internal_name, file=f)
+    target.command('chmod a+rx build/%s.AppDir/AppRun' % nice_filename)
+    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))
+
+def package(target, version, options):
+    """version: DCP-o-matic version string"""
     if target.platform == 'windows':
         return package_windows(target)
     elif target.platform == 'linux':
-        if target.bits == 32:
-            cpu = 'i386'
+        if target.detail == 'appimage':
+            out = []
+            out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version))
+            out.append(make_appimage(target, 'DCP-o-matic Player', 'dcpomatic2_player', version))
+            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))
+            return out
         else:
-            cpu = 'amd64'
-
-        if target.distro == 'debian' or target.distro == 'ubuntu':
-            return package_debian(target, cpu, version)
-        elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
-            return package_rpm(target, cpu, version)
+            if target.bits == 32:
+                cpu = 'i386'
+            else:
+                cpu = 'amd64'
+
+            if target.distro == 'debian' or target.distro == 'ubuntu':
+                return package_debian(target, cpu, version, options)
+            elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
+                return package_rpm(target, cpu, version, options)
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
         return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
@@ -455,6 +639,9 @@ def package(target, version):
         f.close()
         target.command('docker build build/platform/docker -t dcpomatic-server:%s' % version)
         target.command('docker save dcpomatic-server:%s -o dcpomatic-server-%s-docker.tar' % (version, version))
+    elif target.platform == 'flatpak':
+        target.command('%s build-bundle build/platform/repo build/dcpomatic_%s.flatpak com.dcpomatic.DCP-o-matic' % (target.flatpak(), version))
+        return os.path.abspath('build/dcpomatic_%s.flatpak' % version)
 
 def make_pot(target):
     target.command('./waf pot')