Prepare for Ubuntu 23.04.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index a3fcc8c53c93bbe26795303c1ecd323c7fef33e5..ddb4cbf4d300b02cbe270e79effdefae0db09347 100644 (file)
--- a/cscript
+++ b/cscript
@@ -35,6 +35,9 @@ for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']:
 for v in ['22.04', '22.10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-dev', 'python3.10'])
+for v in ['23.04']:
+    deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+    deb_build_depends[v].extend(['libssh-dev', 'python3.11'])
 for v in ['9', '10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python'])
@@ -157,6 +160,23 @@ deb_depends['22.10'].extend(['libboost-filesystem1.74.0',
                              'libxerces-c3.2',
                              'libnanomsg5'])
 
+deb_depends['23.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['23.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',
+                             'libicu72',
+                             'libnettle8',
+                             'libssh-4',
+                             'libx264-164',
+                             'libcurl4',
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg5'])
 
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
@@ -354,6 +374,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_openssl', file=f)
     print('%{_bindir}/dcpomatic2_combiner', file=f)
     print('%{_bindir}/dcpomatic2_verify', file=f)
+    print('%{_bindir}/dcpomatic2_kdm_inspect', file=f)
     if can_build_disk(target):
         print('%{_bindir}/dcpomatic2_disk', file=f)
         print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)
@@ -382,6 +403,10 @@ def make_spec(filename, version, target, options, requires=None):
     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/add_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/add_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/pause_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/pause_white.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)
@@ -424,6 +449,7 @@ def make_spec(filename, version, target, options, requires=None):
     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('/bin/mv %s/bin/dcpkdm %%{buildroot}/usr/bin/dcpomatic2_kdm_inspect' % target.directory, file=f)
     print('', file=f)
     print('%post', file=f)
     print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
@@ -451,9 +477,9 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.33'))
-    deps.append(('libsub', 'v1.6.39'))
-    deps.append(('leqm-nrt', '93ae9e6'))
+    deps.append(('libdcp', 'v1.8.64'))
+    deps.append(('libsub', 'v1.6.44'))
+    deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
     # also need a patched openssl binary to make certificates.
@@ -461,7 +487,7 @@ def dependencies(target, options):
     # the appropriate place later
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
-        deps.append(('lwext4', 'ee865fa65f05e348cd4e0bce0552a2725ad5663a'))
+        deps.append(('lwext4', 'b98f55b806f9dfe9e9374faceed99b689c29f28e'))
     deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169'))
 
     return deps
@@ -672,6 +698,7 @@ def package_debian(target, cpu, version, options):
 
     target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"')
     target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
+    target.set('CDIST_WX_VERSION', "3.2" if target.version == "23.04" else "3.1")
     if not target.debug:
         target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')
 
@@ -723,6 +750,7 @@ def make_appimage(target, nice_name, internal_name, version):
     target.command(f'cp {target.directory}/bin/{internal_name} {appdir}/usr/bin')
     target.command(f'cp {target.directory}/src/openssl/apps/openssl {appdir}/usr/bin/dcpomatic2_openssl')
     target.command(f'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify')
+    target.command(f'cp {target.directory}/bin/dcpkdm {appdir}/usr/bin/dcpomatic2_kdm_inspect')
     target.command(f'mkdir -p {appdir}/usr/share/libdcp')
     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/')
@@ -855,7 +883,7 @@ def test(target, options, test):
     if target.platform == 'windows':
         cmd = 'run\\tests '
     else:
-        cmd = 'run/tests --log_level=test_suite '
+        cmd = 'run/tests --check --log_level=test_suite '
     if target.debug:
         cmd += '--backtrace '
     if test is not None: