X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=6869e25d7854751e340d478f416eba4dc5fc593d;hb=0789ec4463867fb2d0fcef2432d01bbfbfdff824;hp=138cdd4f6f52e82777607f4e8ffcc1dfab3491e6;hpb=87274a4e523068a16e1ce1c6612a270edbc02e6f;p=dcpomatic.git

diff --git a/cscript b/cscript
index 138cdd4f6..6869e25d7 100644
--- a/cscript
+++ b/cscript
@@ -95,7 +95,8 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libnettle6',
                              'libssh-4',
                              'libx264-152',
-                             'libcurl4'])
+                             'libcurl4',
+                             'libpulse0'])
 
 deb_depends['18.10'] = copy.deepcopy(deb_depends_base)
 deb_depends['18.10'].extend(['libboost-filesystem1.65.1',
@@ -111,7 +112,8 @@ deb_depends['18.10'].extend(['libboost-filesystem1.65.1',
                              'libnettle6',
                              'libssh-4',
                              'libx264-152',
-                             'libcurl4'])
+                             'libcurl4',
+                             'libpulse0'])
 
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
@@ -256,6 +258,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_server_cli', file=f)
     print('%{_bindir}/dcpomatic2_kdm_cli', file=f)
     print('%{_bindir}/dcpomatic2_player', file=f)
+    print('%{_bindir}/dcpomatic2_playlist', file=f)
     print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
@@ -280,6 +283,7 @@ def make_spec(filename, version, target, options, 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)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.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', 'fi_FI']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
@@ -327,8 +331,8 @@ def dependencies(target):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', '1b9ef11'))
-    deps.append(('libsub', '149f2ca'))
+    deps.append(('libdcp', 'v1.6.5'))
+    deps.append(('libsub', 'v1.4.4'))
     deps.append(('rtaudio-cdist', 'aad62d7'))
 
     return deps
@@ -339,8 +343,8 @@ def option_defaults():
 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
+    if not (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04'):
+        # Currently we only build tests on Ubuntu 18.04
         opt += ' --disable-tests'
 
     if target.debug:
@@ -608,6 +612,7 @@ def package(target, version, options):
             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 Playlist Editor', 'dcpomatic2_playlist', 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