X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=ea99aaf1de2bd0e4ce126ac5a58bda085b610d67;hb=37b381e63e202c4b6cb86a22fd9f5c256f1671f2;hp=3c338b3ab7f378e2055362a9688fe97c2ebedede;hpb=9495f24b8c533178d26729e0195af4cb11dc25d9;p=dcpomatic.git

diff --git a/cscript b/cscript
index 3c338b3ab..ea99aaf1d 100644
--- a/cscript
+++ b/cscript
@@ -32,7 +32,7 @@ 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']:
+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 ['9', '10']:
@@ -139,6 +139,25 @@ deb_depends['22.04'].extend(['libboost-filesystem1.74.0',
                              'libnanomsg5',
                              'libdav1d5'])
 
+deb_depends['22.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['22.10'].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',
+                             'libicu71',
+                             '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',
                          'libboost-thread1.62.0',
@@ -349,11 +368,16 @@ def make_spec(filename, version, target, options, requires=None):
     if can_build_disk(target):
         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)
-    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/select_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/select_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/sequence_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/sequence_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/snap_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/snap_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_all_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_all_black.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)
@@ -373,7 +397,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_combiner.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', 'sl_SI']:
+              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'sl_SI', 'hu_HU']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
@@ -427,8 +451,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.25'))
-    deps.append(('libsub', 'v1.6.28'))
+    deps.append(('libdcp', 'v1.8.33'))
+    deps.append(('libsub', 'v1.6.36'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -448,11 +472,11 @@ def configure_options(target, options, for_package=False):
     opt = ' --warnings-are-errors'
 
     if for_package or not (
-            (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or
+            (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '22.04']) or
             (target.platform == 'osx') or
             (target.platform == 'windows')
         ):
-        # Currently we only build tests on Ubuntu 18.04, macOS and Windows
+        # Currently we only build tests on macOS, Windows, and some Ubuntu versions
         opt += ' --disable-tests'
 
     if target.debug:
@@ -831,7 +855,7 @@ def test(target, options, test):
     if target.platform == 'windows':
         cmd = 'run\\tests '
     else:
-        cmd = 'run/tests '
+        cmd = 'run/tests --log_level=test_suite '
     if target.debug:
         cmd += '--backtrace '
     if test is not None: