Make Atmos content work more like other content. Now its MXFs

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 6f6f3272a37859a5ae3906a2ebdbbd34dbee7034..864ec90c2d71db1a3f2c83eaab45419a3d0821ea 100644 (file)
--- a/cscript
+++ b/cscript
@@ -37,8 +37,6 @@ deb_build_depends['19.10'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['19.10'].extend(['libssh-dev'])
 deb_build_depends['20.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['20.04'].extend(['libssh-dev'])
-deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['8'].extend(['libssh-gcrypt-dev'])
 deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['9'].extend(['libssh-gcrypt-dev'])
 deb_build_depends['10'] = copy.deepcopy(deb_build_depends_base)
@@ -103,7 +101,7 @@ deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
                              'libcurl4',
                              'libpulse0',
                              'libxerces-c3.2',
-                             'libnanomsg4'])
+                             'libnanomsg5'])
 
 deb_depends['20.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
@@ -124,24 +122,6 @@ deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
                              'libxerces-c3.2',
                              'libnanomsg5'])
 
-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',
-                         'libxml++2.6-2',
-                         'libzip2',
-                         'libcairomm-1.0-1',
-                         'libpangomm-1.4-1',
-                         'libwxgtk3.0-0',
-                         'libxcb-xfixes0',
-                         'libxcb-shape0',
-                         'libicu52',
-                         'libnettle4',
-                         'libssh-4',
-                         'libx264-142',
-                         'libcurl3'])
-
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libboost-thread1.62.0',
@@ -158,7 +138,7 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libnettle6',
                          'libx264-148',
                          'libcurl3',
-                         'libxerces-c3.2'])
+                         'libxerces-c3.1'])
 
 deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5',
                          'libxcb-xfixes0',
@@ -318,6 +298,9 @@ def make_spec(filename, version, target, options, requires=None):
     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}/applications/dcpomatic2_playlist.desktop', file=f)
+    if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
+        print('%{_datadir}/applications/dcpomatic2_disk.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)
@@ -326,6 +309,7 @@ def make_spec(filename, version, target, options, requires=None):
     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/link.png', file=f)
     print('%{_datadir}/dcpomatic2/me.jpg', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
@@ -338,6 +322,7 @@ def make_spec(filename, version, target, options, requires=None):
         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)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.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', 'tr_TR', 'ko_KR']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
@@ -380,7 +365,7 @@ def dependencies(target, options):
     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', '20d3ddf', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
@@ -390,8 +375,8 @@ def dependencies(target, options):
             (target.platform == 'osx' and target.bits == 64) or
             (target.platform == 'windows')) else {}
 
-    deps.append(('libdcp', None, cpp_lib_options))
-    deps.append(('libsub', None, cpp_lib_options))
+    deps.append(('libdcp', '2667081', cpp_lib_options))
+    deps.append(('libsub', 'fc5ce01', cpp_lib_options))
     deps.append(('leqm-nrt', 'carl'))
     deps.append(('rtaudio', 'carl'))
     # We get our OpenSSL libraries from the environment, but we
@@ -400,7 +385,7 @@ def dependencies(target, options):
     # the appropriate place later
     deps.append(('openssl', 'carl'))
     if can_build_disk(target):
-        deps.append(('lwext4', 'carl2'))
+        deps.append(('lwext4', '370b3de6'))
 
     return deps
 
@@ -565,9 +550,7 @@ def build(target, options):
     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')
+        target.command('./waf install')
 
 def package_windows(target):
     identifier = ''
@@ -687,6 +670,7 @@ def package(target, version, options):
             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))
             out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version))
+            out.append(make_appimage(target, 'DCP-o-matic Disk Writer', 'dcpomatic2_disk', version))
             return out
         else:
             if target.bits == 32: