Fix typo if -> of (thanks to Uwe Dittes)

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index a80c220dc28d0c3eb888afdf45cb400ef0743ea0..ee483094577e4fd6497df6732ac4b882a3ee4a0c 100644 (file)
--- a/cscript
+++ b/cscript
@@ -208,15 +208,17 @@ def can_build_disk(target):
     if target.platform == 'osx':
         return True
     if target.platform == 'linux':
-        if target.distro == 'ubuntu' and target.version in ['18.04', '20.04', '20.10']:
+        if target.distro == 'ubuntu' and target.version != '16.04':
             return True
-        if target.distro == 'debian' and target.version == '10':
+        if target.distro == 'debian' and target.version != '9':
             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':
+        if target.distro == 'centos' and target.version != '7':
+            return True
+        if target.distro == 'mageia':
             return True
     return False
 
@@ -301,7 +303,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_verify', file=f)
     if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
         print('%{_bindir}/dcpomatic2_disk', file=f)
-        print('%{_bindir}/dcpomatic2_disk_writer', file=f)
+        print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)
     print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
@@ -341,6 +343,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)
@@ -380,14 +383,14 @@ def dependencies(target, options):
         ffmpeg_options = {}
 
     if target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg-cdist', 'e89aa4a', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', '107f9af8', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', '3a328b6'))
-    deps.append(('libsub', '2bbddc6'))
-    deps.append(('leqm-nrt', '131f971'))
+    deps.append(('libdcp', 'b3cb9c0'))
+    deps.append(('libsub', '587e475'))
+    deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
     # also need a patched openssl binary to make certificates.
@@ -395,8 +398,8 @@ def dependencies(target, options):
     # the appropriate place later
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
-        deps.append(('lwext4', '9d20ec5'))
-    deps.append(('ffcmp', 'a915540'))
+        deps.append(('lwext4', 'cce3730'))
+    deps.append(('ffcmp', '6259cd4'))
 
     return deps
 
@@ -579,6 +582,11 @@ def package_windows(target):
 
 def package_debian(target, cpu, version, options):
     make_control(target.version, target.bits, 'debian/control', target.debug, options['gui'])
+    if target.version != '9' and target.version != '16.04':
+        with open('debian/postinst', 'w') as f:
+            print('#!/bin/sh', file=f)
+            # Get the required capability to write to disks
+            print('setcap "cap_dac_override+ep cap_sys_admin+ep" /usr/bin/dcpomatic2_disk_writer', file=f)
     target.command('./waf dist')
     f = open('debian/files', 'w')
     print('dcpomatic_%s-1_%s.deb video extra' % (version, cpu), file=f)
@@ -624,7 +632,7 @@ def package_rpm(target, cpu, version, options):
 
     requires = None
     if target.distro == 'mageia':
-        requires = "lib64xmlsec1-devel"
+        requires = "lib64xmlsec1-devel lib64canberra-gtk0"
 
     make_spec('build/platform/linux/dcpomatic2.spec', version, target, options, requires)
     cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir
@@ -641,16 +649,22 @@ def package_rpm(target, cpu, version, options):
 
     return rpms
 
-def make_appimage(target, nice_name, internal_name, version):
+def make_appimage(target, nice_name, internal_name, version, extra_bin=None):
     nice_filename = nice_name.replace(' ', '_')
     os.makedirs('build/%s.AppDir/usr/bin' % nice_filename)
     target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename))
+    if extra_bin:
+        target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, extra_bin, nice_filename))
     target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename))
     target.command('cp %s/bin/dcpverify build/%s.AppDir/usr/bin/dcpomatic2_verify' % (target.directory, nice_filename))
     target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename)
     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)
@@ -682,7 +696,7 @@ def package(target, version, options):
             out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version))
             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 Disk Writer', 'dcpomatic2_disk', version, "dcpomatic2_disk_writer"))
             out.append(make_appimage(target, 'DCP-o-matic Combiner', 'dcpomatic2_combiner', version))
             return out
         else:
@@ -696,7 +710,8 @@ def package(target, version, options):
             elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
                 return package_rpm(target, cpu, version, options)
     elif target.platform == 'osx':
-        target.command('bash platform/osx/make_dmg.sh %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
+        archs = ' '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets)
+        target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs))
         packages = []
         for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'):
             a = os.path.abspath(x)
@@ -712,6 +727,8 @@ def package(target, version, options):
                 packages.append((a, "com.dcpomatic.server"))
             elif x.find("Disk Writer") != -1:
                 packages.append((a, "com.dcpomatic.disk"))
+            elif x.find("Combiner") != -1:
+                packages.append((a, "com.dcpomatic.combiner"))
             else:
                 packages.append((a, "com.dcpomatic"))
         return packages