Update waf and bump deps for similar updates.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 0468e6e944a6649918230ebfa041e3f4530ed16f..5f452b5bff24e569cef2fb3587a124465b7e07f5 100644 (file)
--- a/cscript
+++ b/cscript
@@ -33,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)
@@ -54,7 +54,6 @@ 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',
@@ -70,7 +69,6 @@ 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',
@@ -83,27 +81,27 @@ 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',
-                             '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',
-                             'libcurl3'])
+                             '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',
@@ -119,7 +117,6 @@ 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',
@@ -136,7 +133,6 @@ 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',
@@ -155,7 +151,6 @@ 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',
@@ -179,7 +174,6 @@ 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',
@@ -250,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)
@@ -268,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)
@@ -326,22 +322,27 @@ 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', '9eb185c'))
-    deps.append(('libsub', '04d5701'))
-    deps.append(('rtaudio-cdist', '739969e'))
+    deps.append(('libdcp', 'a2feb49'))
+    deps.append(('libsub', '8bb11a3'))
+    deps.append(('rtaudio-cdist', 'aad62d7'))
 
     return deps
 
 def option_defaults():
-    return { "player-only": False, "gui": True, "variant": None }
+    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':
@@ -349,7 +350,6 @@ def configure_options(target, options):
     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':
@@ -363,9 +363,6 @@ 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']
 
@@ -385,11 +382,6 @@ def build(target, options):
                         'sources': [{'type': 'archive',
                                      'url': '%s/libzip-1.4.0.tar.xz' % prefix,
                                     'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]})
-        modules.append({'name': 'imagemagick',
-                        'cleanup': ['/bin'],
-                        'sources': [{'type': 'archive',
-                                    'url': '%s/ImageMagick-7.0.8-11.tar.bz2' % prefix,
-                                    'sha256': 'a1aef96c89a9a9fac51a6e141deffa0b2f8db2062a24f6ba9fe3846dde7491ac'}]})
         modules.append({'name': 'libsigc++',
                         'sources': [{'type': 'archive',
                                      'url': '%s/libsigc++-2.10.0.tar.xz' % prefix,
@@ -579,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
@@ -604,6 +594,7 @@ def make_appimage(target, nice_name, internal_name, version):
         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))