More test fixes.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index af57aa6dbd32dac646d837a5fa8b60e2669be04e..4ed5f2b2ddd8a1c25dd5fca5c552af1a067ff534 100644 (file)
--- a/cscript
+++ b/cscript
@@ -214,7 +214,7 @@ def can_build_disk(target):
             return True
         if target.detail == 'appimage':
             return True 
-        if target.distro == 'fedora' and target.version == '31':
+        if target.distro == 'fedora' and int(target.version) >= 31:
             return True
         if target.distro == 'centos' and target.version == '8':
             return True
@@ -341,6 +341,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}/polkit-1/actions/com.dcpomatic.write-drive.policy', file=f)
     print('', file=f)
     print('%prep', file=f)
     print('rm -rf $RPM_BUILD_DIR/dcpomatic-%s' % version, file=f)
@@ -385,8 +386,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'f536156'))
-    deps.append(('libsub', '6dd6a0a'))
+    deps.append(('libdcp', '5e1ce36'))
+    deps.append(('libsub', 'cf5c3db'))
     deps.append(('leqm-nrt', '131f971'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -651,6 +652,10 @@ def make_appimage(target, nice_name, internal_name, version):
     target.command('cp -r %s/share/dcpomatic2 build/%s.AppDir/usr/share/' % (target.directory, nice_filename))
     target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename))
     target.command('cp -r %s/share/libdcp/tags build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename))
+    if internal_name == 'dcpomatic2_disk':
+        target.command('mkdir -p build/%s.AppDir/usr/share/polkit-1/actions', nice_filename)
+        target.command('cp %s/share/polkit-1/actions/com.dcpomatic.write-drive.policy build/%s.AppDir/usr/share/polkit-1/actions' % (target.directory, nice_filename))
+
     with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f:
         print('#!/bin/bash', file=f)
         print('export PATH=$APPDIR/usr/bin:$PATH', file=f)
@@ -683,6 +688,7 @@ def package(target, version, options):
             out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version))
             out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version))
             out.append(make_appimage(target, 'DCP-o-matic Disk Writer', 'dcpomatic2_disk', version))
+            out.append(make_appimage(target, 'DCP-o-matic Combiner', 'dcpomatic2_combiner', version))
             return out
         else:
             if target.bits == 32: