Add config option for default KDM type.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 7feb7eb036090bdadb0630583580a2ec78285eff..25208d1a2825c88d878b14a6a6c6af543e685faa 100644 (file)
--- 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:
@@ -352,6 +354,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
     print('%{_datadir}/libdcp/tags/*', file=f)
     print('%{_datadir}/libdcp/xsd/*', file=f)
+    print('%{_datadir}/libdcp/ratings', file=f)
     print('%{_datadir}/polkit-1/actions/com.dcpomatic.write-drive.policy', file=f)
     print('', file=f)
     print('%prep', file=f)
@@ -370,6 +373,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('/bin/mkdir -p %{buildroot}/usr/share/libdcp', file=f)
     print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
     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('', file=f)
     print('%post', file=f)
@@ -393,13 +397,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.8'))
-    deps.append(('libsub', 'v1.6.8'))
+    deps.append(('libdcp', 'v1.8.11'))
+    deps.append(('libsub', 'v1.6.11'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -409,7 +413,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
 
@@ -674,6 +678,7 @@ def make_appimage(target, nice_name, internal_name, version):
     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/')
     target.command(f'cp -r {target.directory}/share/libdcp/tags {appdir}/usr/share/libdcp/')
+    target.command(f'cp {target.directory}/share/libdcp/ratings {appdir}/usr/share/libdcp/')
     lib = 'usr/lib/x86_64-linux-gnu'
     target.command(f'mkdir -p build/{nice_filename}.AppDir/{lib}/gdk-pixbuf-2.0/2.10.0')
     target.command(f'cp -a /{lib}/gdk-pixbuf-2.0 build/{nice_filename}.AppDir/usr/lib/x86_64-linux-gnu/')