X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=1addf43692c7946d468536842cf28dd86b683684;hb=b69ce61da1e8594cd01f46a8f3318cf31918a89a;hp=74da1bc7438081191b975478592cd35954a5a640;hpb=07f451e01f82793904482f55c5a89163c6bb8e44;p=dcpomatic.git

diff --git a/cscript b/cscript
index 74da1bc74..1addf4369 100644
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -37,6 +37,8 @@ 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['20.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['20.04'].extend(['libssh-dev'])
 deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['7'].extend(['libssh-dev'])
 deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
@@ -119,6 +121,25 @@ deb_depends['19.10'].extend(['libboost-filesystem1.67.0',
                              'libcurl4',
                              'libpulse0'])
 
+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-gtk3-0v5',
+                             'libicu66',
+                             'libnettle7',
+                             'libssh-4',
+                             'libx264-155',
+                             'libcurl4',
+                             'libpulse0',
+                             'libxerces-c3.2',
+                             'libnanomsg5'])
+
 deb_depends['8'] = copy.deepcopy(deb_depends_base)
 deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libboost-thread1.55.0',
@@ -344,8 +365,8 @@ def dependencies(target):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.6.14'))
-    deps.append(('libsub', 'v1.4.16'))
+    deps.append(('libdcp', 'v1.6.15'))
+    deps.append(('libsub', 'v1.4.19'))
     deps.append(('rtaudio-cdist', 'bf0fc23'))
 
     return deps
@@ -640,8 +661,11 @@ def package(target, version, options):
                 return package_debian(target, cpu, 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' % (target.environment_prefix, target.directory))
+    elif target.platform == 'osx' and target.bits is None:
+        target.command('bash platform/osx/make_dmg.sh %s %s universal %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
+        return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
+    elif target.platform == 'osx' and target.bits == 64:
+        target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
         return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
     elif target.platform == 'docker':
         shutil.copyfile(target.deb, 'build/platform/docker')