Fill test disk partitions with random noise to expose more bugs.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 7feb7eb036090bdadb0630583580a2ec78285eff..90480a34398ad40220e15ca0f6f0751416957ac7 100644 (file)
--- a/cscript
+++ b/cscript
@@ -32,6 +32,9 @@ deb_build_depends_base = ['debhelper', 'g++', 'pkg-config', 'libsndfile1-dev', '
 for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-dev', 'python'])
+for v in ['22.04']:
+    deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+    deb_build_depends[v].extend(['libssh-dev', 'python3.10'])
 for v in ['9', '10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python'])
@@ -117,6 +120,25 @@ deb_depends['21.10'].extend(['libboost-filesystem1.74.0',
                              'libnanomsg5',
                              'libdav1d4'])
 
+deb_depends['22.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['22.04'].extend(['libboost-filesystem1.74.0',
+                             'libboost-thread1.74.0',
+                             'libboost-regex1.74.0',
+                             'libboost-date-time1.74.0',
+                             'libcairomm-1.0-1v5',
+                             'libpangomm-1.4-1v5',
+                             'libxml++2.6-2v5',
+                             'libzip4',
+                             'libicu70',
+                             'libnettle8',
+                             'libssh-4',
+                             'libx264-163',
+                             'libcurl4',
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg5',
+                             'libdav1d5'])
+
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libboost-thread1.62.0',
@@ -247,6 +269,8 @@ def make_control(debian_version, bits, filename, debug, gui):
     print('', file=f)
     suffix = '' if gui else '-cli'
     print(f'Package: dcpomatic{suffix}', file=f)
+    if gui:
+        print('Replaces: dcpomatic-cli', file=f)
     if bits == 32:
         print('Architecture: i386', file=f)
     else:
@@ -301,6 +325,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_batch', file=f)
     print('%{_bindir}/dcpomatic2_cli', file=f)
     print('%{_bindir}/dcpomatic2_create', file=f)
+    print('%{_bindir}/dcpomatic2_editor', file=f)
     print('%{_bindir}/dcpomatic2_kdm', file=f)
     print('%{_bindir}/dcpomatic2_server', file=f)
     print('%{_bindir}/dcpomatic2_server_cli', file=f)
@@ -315,6 +340,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)
     print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_editor.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)
@@ -339,6 +365,7 @@ def make_spec(filename, version, target, options, requires=None):
     for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']:
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_editor.png' % r, file=f)
         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)
@@ -352,6 +379,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
     print('%{_datadir}/libdcp/tags/*', file=f)
     print('%{_datadir}/libdcp/xsd/*', file=f)
+    print('%{_datadir}/libdcp/ratings', file=f)
     print('%{_datadir}/polkit-1/actions/com.dcpomatic.write-drive.policy', file=f)
     print('', file=f)
     print('%prep', file=f)
@@ -370,6 +398,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('/bin/mkdir -p %{buildroot}/usr/share/libdcp', file=f)
     print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
     print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
+    print('/bin/cp %s/src/libdcp/ratings %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
     print('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify' % target.directory, file=f)
     print('', file=f)
     print('%post', file=f)
@@ -393,13 +422,13 @@ def dependencies(target, options):
         ffmpeg_options = {}
 
     if target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg-cdist', 'cb2b073d4f88230fca1d1d74e45235f5268fd825', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', '4721b55de017702b0d1c8ce1163331378905c637', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.8'))
-    deps.append(('libsub', 'v1.6.8'))
+    deps.append(('libdcp', 'v1.8.22'))
+    deps.append(('libsub', 'v1.6.23'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -409,7 +438,7 @@ def dependencies(target, options):
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
         deps.append(('lwext4', 'cce3730'))
-    deps.append(('ffcmp', '10934f1a9cd9770ef0b38da153f9576e77e7e925'))
+    deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169'))
 
     return deps
 
@@ -674,6 +703,7 @@ def make_appimage(target, nice_name, internal_name, version):
     target.command(f'cp -r {target.directory}/share/dcpomatic2 {appdir}/usr/share/')
     target.command(f'cp -r {target.directory}/share/libdcp/xsd {appdir}/usr/share/libdcp/')
     target.command(f'cp -r {target.directory}/share/libdcp/tags {appdir}/usr/share/libdcp/')
+    target.command(f'cp {target.directory}/share/libdcp/ratings {appdir}/usr/share/libdcp/')
     lib = 'usr/lib/x86_64-linux-gnu'
     target.command(f'mkdir -p build/{nice_filename}.AppDir/{lib}/gdk-pixbuf-2.0/2.10.0')
     target.command(f'cp -a /{lib}/gdk-pixbuf-2.0 build/{nice_filename}.AppDir/usr/lib/x86_64-linux-gnu/')
@@ -725,6 +755,7 @@ def package(target, version, options):
             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 Combiner', 'dcpomatic2_combiner', version))
+            out.append(make_appimage(target, 'DCP-o-matic Editor', 'dcpomatic2_editor', version))
             return out
         else:
             if target.bits == 32:
@@ -756,6 +787,8 @@ def package(target, version, options):
                 packages.append((a, "com.dcpomatic.disk"))
             elif x.find("Combiner") != -1:
                 packages.append((a, "com.dcpomatic.combiner"))
+            elif x.find("Editor") != -1:
+                packages.append((a, "com.dcpomatic.editor"))
             else:
                 packages.append((a, "com.dcpomatic"))
         return packages