Update waf and bump deps for similar updates.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 9f12046ecedb01acf6063c2ffe754ff9267acb5a..5f452b5bff24e569cef2fb3587a124465b7e07f5 100644 (file)
--- a/cscript
+++ b/cscript
@@ -33,8 +33,6 @@ 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)
@@ -83,20 +81,6 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              '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',
-                             'libxml++2.6-2v5',
-                             'libboost-date-time1.62.0',
-                             'libzip4',
-                             'libwxgtk3.0-0v5',
-                             'libicu57',
-                             'libnettle6',
-                             'libssh-4',
-                             'libx264-148',
-                             'libcurl3'])
-
 deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libboost-thread1.65.1',
@@ -260,8 +244,7 @@ def make_spec(filename, version, target, options, requires=None):
     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)
@@ -278,12 +261,15 @@ def make_spec(filename, version, target, options, requires=None):
     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)
@@ -336,14 +322,14 @@ def dependencies(target):
     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', '27f25fb', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', 'a820b44', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', '27e1378'))
-    deps.append(('libsub', '2728525'))
-    deps.append(('rtaudio-cdist', '739969e'))
+    deps.append(('libdcp', 'a2feb49'))
+    deps.append(('libsub', '8bb11a3'))
+    deps.append(('rtaudio-cdist', 'aad62d7'))
 
     return deps
 
@@ -585,9 +571,7 @@ def package_rpm(target, cpu, version, options):
     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