Bump ffmpeg to 5.1.2 "Riemann"

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 4659ce285a4e19bc818158eddba22f87ac0f7115..4f87aaff1325675ea2adc45bf26a6c6863791002 100644 (file)
--- a/cscript
+++ b/cscript
@@ -368,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)
@@ -441,13 +446,13 @@ def dependencies(target, options):
         ffmpeg_options = {}
 
     if target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg-cdist', '4721b55de017702b0d1c8ce1163331378905c637', ffmpeg_options)]
+        deps = [('ffmpeg', 'b5190a92da64ee196a8afa3ededbfc94d0000c68', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.31'))
-    deps.append(('libsub', 'v1.6.34'))
+    deps.append(('libdcp', 'v1.8.32'))
+    deps.append(('libsub', 'v1.6.35'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -457,7 +462,7 @@ def dependencies(target, options):
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
         deps.append(('lwext4', 'ee865fa65f05e348cd4e0bce0552a2725ad5663a'))
-    deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169'))
+    deps.append(('ffcmp', 'ea340a286078e025dcf9a0c75c6313d318dbf32b'))
 
     return deps
 
@@ -467,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: