X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=a38929b4d189442540a41284fc4deae194dd3ae6;hb=599ce9ce83d3d7fcb6bb42ba76c49c110c9a62cc;hp=a90e5f6bdad08a4de99e0cddc44185642335b0a1;hpb=d07c4241b58fc654cf0331d09d0814b4d6a24743;p=dcpomatic.git

diff --git a/cscript b/cscript
index a90e5f6bd..a38929b4d 100644
--- a/cscript
+++ b/cscript
@@ -33,12 +33,10 @@ deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['16.04'].extend(['libssh-dev'])
 deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['18.04'].extend(['libssh-dev'])
-deb_build_depends['19.04'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['19.04'].extend(['libssh-dev'])
 deb_build_depends['19.10'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['19.10'].extend(['libssh-dev'])
-deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['7'].extend(['libssh-dev'])
+deb_build_depends['20.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['20.04'].extend(['libssh-dev'])
 deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['8'].extend(['libssh-gcrypt-dev'])
 deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base)
@@ -66,7 +64,8 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libnettle6',
                              'libssh-4',
                              'libx264-148',
-                             'libcurl3'])
+                             'libcurl3',
+                             'libxerces-c3.1'])
 
 deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
@@ -83,10 +82,12 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libssh-4',
                              'libx264-152',
                              'libcurl4',
-                             'libpulse0'])
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg4'])
 
-deb_depends['19.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['19.04'].extend(['libboost-filesystem1.67.0',
+deb_depends['19.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
                              'libboost-thread1.67.0',
                              'libboost-regex1.67.0',
                              'libboost-date-time1.67.0',
@@ -100,24 +101,28 @@ deb_depends['19.04'].extend(['libboost-filesystem1.67.0',
                              'libssh-4',
                              'libx264-155',
                              'libcurl4',
-                             'libpulse0'])
-
-deb_depends['19.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
-                             'libboost-thread1.67.0',
-                             'libboost-regex1.67.0',
-                             'libboost-date-time1.67.0',
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg4'])
+
+deb_depends['20.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
+                             'libboost-thread1.71.0',
+                             'libboost-regex1.71.0',
+                             'libboost-date-time1.71.0',
                              'libcairomm-1.0-1v5',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
                              'libzip5',
-                             'libwxgtk3.0-0v5',
-                             'libicu63',
-                             'libnettle6',
+                             'libwxgtk3.0-gtk3-0v5',
+                             'libicu66',
+                             'libnettle7',
                              'libssh-4',
                              'libx264-155',
                              'libcurl4',
-                             'libpulse0'])
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg4'])
 
 deb_depends['8'] = copy.deepcopy(deb_depends_base)
 deb_depends['8'].extend(['libboost-filesystem1.55.0',
@@ -152,7 +157,8 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libssh-gcrypt-4',
                          'libnettle6',
                          'libx264-148',
-                         'libcurl3'])
+                         'libcurl3',
+                         'libxerces-c3.2'])
 
 deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5',
                          'libxcb-xfixes0',
@@ -175,7 +181,9 @@ deb_depends['10'].extend(['libboost-filesystem1.67.0',
                           'libssh-gcrypt-4',
                           'libnettle6',
                           'libx264-155',
-                          'libcurl4'])
+                          'libcurl4',
+                          'libxerces-c3.2',
+                          'libnanomsg5'])
 
 deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5',
                           'libxcb-xfixes0',
@@ -194,16 +202,32 @@ deb_depends['unstable'].extend(['libboost-filesystem1.67.0',
                                 'libicu63',
                                 'libnettle6',
                                 'libx264-155',
-                                'libcurl4'])
+                                'libcurl4',
+                                'libxerces-c3.2'])
 
 def can_build_disk(target):
     # We can build dcpomatic2_disk on platforms that have Boost process and can build the lwext4
     # library.  For now, just whitelist good ones here.
     #
-    # - Lots of Linux distros don't have a new enough boost (1.64 or above)
+    # - Lots of Linux distros (including Ubuntu 16.04) 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