X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=af3e87ec73031465c5a9f9ce95361b66741c81d2;hb=f7991cd93c90416a2759c8146d6998ff15f204ec;hp=6e5712bcf82f7c9aee8421df381dc1cee4aaf717;hpb=d5c220f76907f0113bf0b5d3a7e26e5b27197a17;p=dcpomatic.git

diff --git a/cscript b/cscript
index 6e5712bcf..af3e87ec7 100644
--- a/cscript
+++ b/cscript
@@ -208,13 +208,13 @@ 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 in ['18.04', '20.04', '20.10', '21.04']:
             return True
         if target.distro == 'debian' and target.version == '10':
             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)
@@ -380,13 +381,13 @@ 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', '274dd30'))
-    deps.append(('libsub', '276532e'))
+    deps.append(('libdcp', '6384002'))
+    deps.append(('libsub', '55ebde1'))
     deps.append(('leqm-nrt', '131f971'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -396,7 +397,7 @@ def dependencies(target, options):
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
         deps.append(('lwext4', '9d20ec5'))
-    deps.append(('ffcmp', 'a915540'))
+    deps.append(('ffcmp', '6259cd4'))
 
     return deps
 
@@ -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)