Expand can_build_disk a bit.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 112a48e3650631c5195b49d4063dfe9c612a42ae..ee06e3eebcd55ea4d94790de8ec898ed8f79c94d 100644 (file)
--- a/cscript
+++ b/cscript
@@ -64,7 +64,8 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libnettle6',
                              'libssh-4',
                              'libx264-148',
-                             'libcurl3'])
+                             'libcurl3',
+                             'libxerces-c3.2'])
 
 deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
@@ -81,7 +82,9 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libssh-4',
                              'libx264-152',
                              'libcurl4',
-                             'libpulse0'])
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg4'])
 
 deb_depends['19.10'] = copy.deepcopy(deb_depends_base)
 deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
@@ -98,7 +101,9 @@ deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
                              'libssh-4',
                              'libx264-155',
                              'libcurl4',
-                             'libpulse0'])
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg4'])
 
 deb_depends['20.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
@@ -116,7 +121,8 @@ deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
                              'libx264-155',
                              'libcurl4',
                              'libpulse0',
-                             'libxerces-c3.2'])
+                             'libxerces-c3.2',
+                             'libnanomsg4'])
 
 deb_depends['8'] = copy.deepcopy(deb_depends_base)
 deb_depends['8'].extend(['libboost-filesystem1.55.0',
@@ -202,7 +208,22 @@ def can_build_disk(target):
     # - Lots of Linux distros don't have a new enough boost (1.64 or above)
     # - On Centos 6 we can't build lwext4 because it needs a new CMake which Centos 6's g++ is not new enough to build.
     # - On Centos 7 there is a build error in lwext4 related to __unused
-    return target.platform == 'windows' or target.platform == 'osx' or (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '18.10', '19.04'])
+    if target.platform == 'windows':
+        return True
+    if target.platform == 'osx':
+        return True
+    if target.platform == 'linux':
+        if target.distro == 'ubuntu' and target.version in ['18.04', '19.10', '20.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':
+            return True
+        if target.distro == 'centos' and target.version == '8':
+            return True
+    return False
 
 def packages(name, packages, f):
     s = '%s: ' % name