Relax error handling when examining FFmpeg files (#2187).

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index b77448ac319bddd8986b106bf31ddf44453a8f18..21eca89108f3b1e3641aea8634b2858f9760c5cc 100644 (file)
--- a/cscript
+++ b/cscript
@@ -280,6 +280,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:
@@ -427,13 +429,13 @@ def dependencies(target, options):
         ffmpeg_options = {}
 
     if target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg-cdist', '107f9af8', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', '4c5269fa', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.5'))
-    deps.append(('libsub', 'v1.6.5'))
+    deps.append(('libdcp', 'e579b4c'))
+    deps.append(('libsub', 'f24a2c1'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -443,7 +445,7 @@ def dependencies(target, options):
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
         deps.append(('lwext4', 'cce3730'))
-    deps.append(('ffcmp', '6259cd4'))
+    deps.append(('ffcmp', 'b9b29fc6'))
 
     return deps
 
@@ -678,7 +680,7 @@ def package_rpm(target, cpu, version, options):
 
     requires = None
     if target.distro == 'mageia':
-        requires = "lib64xmlsec1-devel lib64canberra-gtk0"
+        requires = "lib64xmlsec1-devel lib64canberra-gtk0 libcap-utils"
 
     make_spec('build/platform/linux/dcpomatic2.spec', version, target, options, requires)
     cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir