X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=d165b0aef09df67f83263d7a358b80dfed125420;hb=de6798c0208e9a6a64b0f8edc54f03b46ced0e22;hp=a7dd0282e61eb9e222daddc6db68d1f86f618919;hpb=c8d369f27ae1725abb241ac2fba425509a4e55d2;p=dcpomatic.git

diff --git a/cscript b/cscript
index a7dd0282e..d165b0aef 100644
--- a/cscript
+++ b/cscript
@@ -29,16 +29,14 @@ deb_build_depends = dict()
 
 deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev']
 
-deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['14.04'].extend(['libssh-dev'])
 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['18.10'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['18.10'].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['8'] = copy.deepcopy(deb_build_depends_base)
@@ -54,21 +52,6 @@ deb_depends_gui = dict()
 
 deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libgtk2.0-0']
 
-deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
-                             'libboost-thread1.54.0',
-                             'libboost-regex1.54.0',
-                             'libxml++2.6-2',
-                             'libboost-date-time1.54.0',
-                             'libzip2',
-                             'libcairomm-1.0-1',
-                             'libpangomm-1.4-1,'
-                             'libicu52',
-                             'libnettle4',
-                             'libssh-4',
-                             'libx264-142',
-                             'libcurl3'])
-
 deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libboost-thread1.58.0',
@@ -102,25 +85,25 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libcurl4',
                              'libpulse0'])
 
-deb_depends['18.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['18.10'].extend(['libboost-filesystem1.65.1',
-                             'libboost-thread1.65.1',
-                             'libboost-regex1.65.1',
-                             'libboost-date-time1.65.1',
+deb_depends['19.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['19.04'].extend(['libboost-filesystem1.67.0',
+                             'libboost-thread1.67.0',
+                             'libboost-regex1.67.0',
+                             'libboost-date-time1.67.0',
                              'libcairomm-1.0-1v5',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
-                             'libzip4',
+                             'libzip5',
                              'libwxgtk3.0-0v5',
-                             'libicu60',
+                             'libicu63',
                              'libnettle6',
                              'libssh-4',
-                             'libx264-152',
+                             'libx264-155',
                              'libcurl4',
                              'libpulse0'])
 
-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',
@@ -136,21 +119,6 @@ deb_depends['19.04'].extend(['libboost-filesystem1.67.0',
                              'libcurl4',
                              'libpulse0'])
 
-deb_depends['7'] = copy.deepcopy(deb_depends_base)
-deb_depends['7'].extend(['libboost-filesystem1.49.0',
-                         'libboost-thread1.49.0',
-                         'libboost-regex1.49.0',
-                         'libxml++2.6-2',
-                         'libboost-date-time1.49.0',
-                         'libzip2',
-                         'libcairomm-1.0-1',
-                         'libpangomm-1.4-1',
-                         'libicu48',
-                         'libnettle4',
-                         'libnotify4',
-                         'libx264-123',
-                         'libcurl3'])
-
 deb_depends['8'] = copy.deepcopy(deb_depends_base)
 deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libboost-thread1.55.0',
@@ -376,8 +344,8 @@ def dependencies(target):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.6.8'))
-    deps.append(('libsub', 'v1.4.10'))
+    deps.append(('libdcp', 'v1.6.14'))
+    deps.append(('libsub', 'v1.4.18'))
     deps.append(('rtaudio-cdist', 'bf0fc23'))
 
     return deps
@@ -673,7 +641,7 @@ def package(target, 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' % target.directory)
+        target.command('bash platform/osx/make_dmg.sh %s %s' % (target.environment_prefix, target.directory))
         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')