fixup! Support debian 11.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index ce673c5d9d75e4c73c6e7b48ec72d40ccb9b4746..db676c33507fb84bdfee7dc1d525f51900591362 100644 (file)
--- a/cscript
+++ b/cscript
@@ -27,15 +27,19 @@ import json
 
 deb_build_depends = dict()
 
-deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev']
+deb_build_depends_base = ['debhelper', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev']
 
 for v in ['16.04', '18.04', '20.04', '20.10', '21.04']: 
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
-    deb_build_depends[v].extend(['libssh-dev'])
+    deb_build_depends[v].extend(['libssh-dev', 'python'])
 for v in ['9', '10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
-    deb_build_depends[v].extend(['libssh-gcrypt-dev'])
+    deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python'])
+for v in ['11']:
+    deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+    deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.9'])
 deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['unstable'].extend(['python'])
 
 deb_depends = dict()
 deb_depends_gui = dict()
@@ -182,6 +186,30 @@ deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5',
                           'libasound2',
                           'libpulse0' ]
 
+deb_depends['11'] = copy.deepcopy(deb_depends_base)
+deb_depends['11'].extend(['libboost-filesystem1.74.0',
+                          'libboost-thread1.74.0',
+                          'libboost-regex1.74.0',
+                          'libboost-date-time1.74.0',
+                          'libxml++2.6-2v5',
+                          'libzip4',
+                          'libcairomm-1.0-1v5',
+                          'libpangomm-1.4-1v5',
+                          'libicu67',
+                          'libssh-4',
+                          'libssh-gcrypt-4',
+                          'libnettle8',
+                          'libx264-160',
+                          'libcurl4',
+                          'libxerces-c3.2',
+                          'libnanomsg5'])
+
+deb_depends_gui['11'] = [ 'libwxgtk3.0-gtk3-0v5',
+                          'libxcb-xfixes0',
+                          'libxcb-shape0',
+                          'libasound2',
+                          'libpulse0' ]
+
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
 deb_depends['unstable'].extend(['libboost-filesystem1.67.0',
                                 'libboost-thread1.67.0',
@@ -208,15 +236,15 @@ 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', '21.04']:
+        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 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
@@ -303,7 +331,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('%attr(4755, root, root) %{_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)
@@ -388,8 +416,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', '6384002'))
-    deps.append(('libsub', '55ebde1'))
+    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
@@ -398,7 +426,7 @@ def dependencies(target, options):
     # the appropriate place later
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
-        deps.append(('lwext4', '9d20ec5'))
+        deps.append(('lwext4', 'cce3730'))
     deps.append(('ffcmp', '6259cd4'))
 
     return deps
@@ -582,6 +610,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)
@@ -627,7 +660,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