X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=e5b88109817689e810a70b62d892db19de4dcf0a;hb=df32940ed20af828db106d57120e4bbde0855bac;hp=7bf3ce5ec74715cd554fe4322615a2672aa3f563;hpb=ee254e6159964427e0536c7d9075483fdafd963f;p=dcpomatic.git

diff --git a/cscript b/cscript
index 7bf3ce5ec..e5b881098 100644
--- a/cscript
+++ b/cscript
@@ -247,6 +247,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:
@@ -393,13 +395,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.7'))
-    deps.append(('libsub', 'v1.6.7'))
+    deps.append(('libdcp', 'v1.8.8'))
+    deps.append(('libsub', 'v1.6.8'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -409,7 +411,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
 
@@ -429,7 +431,7 @@ def configure_options(target, options, for_package=False):
     if target.debug:
         opt += ' --enable-debug'
     if target.platform == 'windows':
-        opt += ' --target-windows'
+        opt += f' --target-windows-{target.bits}'
     elif target.platform == 'linux':
         opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':