X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=e8bcf00915c3101fb507c91a588783f90cdb5c8f;hb=83efe84020dc0ba2801c4b305448790720fe133f;hp=9dda13d3a7958dff48993bbfa764ab2548793a71;hpb=03c5a8155043613c01e0e151735a7fcf8ab84415;p=dcpomatic.git

diff --git a/cscript b/cscript
index 9dda13d3a..e8bcf0091 100644
--- a/cscript
+++ b/cscript
@@ -38,7 +38,8 @@ deb_depends['12.04'].extend(['libboost-filesystem1.48.0',
                              'libxml++2.6-2',
                              'libboost-date-time1.48.0',
                              'libzip2',
-                             'libicu48'])
+                             'libicu48',
+                             'libnettle4'])
 
 deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
@@ -50,18 +51,8 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
                              'libzip2',
                              'libcairomm-1.0-1',
                              'libpangomm-1.4-1',
-                             'libicu52'])
-
-deb_depends['15.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['15.10'].extend(['libboost-filesystem1.58.0',
-                             'libboost-thread1.58.0',
-                             'libboost-regex1.58.0',
-                             'libmagick++-6.q16-5v5',
-                             'libxml++2.6-2v5',
-                             'libboost-date-time1.58.0',
-                             'libzip4',
-                             'libwxgtk3.0-0v5',
-                             'libicu55'])
+                             'libicu52',
+                             'libnettle4'])
 
 deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
@@ -72,7 +63,8 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libboost-date-time1.58.0',
                              'libzip4',
                              'libwxgtk3.0-0v5',
-                             'libicu55'])
+                             'libicu55',
+                             'libnettle6'])
 
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
@@ -84,7 +76,9 @@ deb_depends['7'].extend(['libboost-filesystem1.49.0',
                              'libzip2',
                              'libcairomm-1.0-1',
                              'libpangomm-1.4-1',
-                             'libicu48'])
+                             'libicu48',
+                             'libnettle4',
+                             'libnotify4'])
 
 deb_depends['8'] = copy.deepcopy(deb_depends_base)
 deb_depends['8'].extend(['libboost-filesystem1.55.0',
@@ -97,7 +91,8 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libwxgtk3.0-0',
                          'libxcb-xfixes0',
                          'libxcb-shape0',
-                         'libicu52'])
+                         'libicu52',
+                         'libnettle4'])
 
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
 deb_depends['unstable'].extend(['libboost-filesystem1.58.0',
@@ -108,7 +103,8 @@ deb_depends['unstable'].extend(['libboost-filesystem1.58.0',
                                 'libgtk2.0-0',
                                 'libboost-date-time1.58.0',
                                 'libzip2',
-                                'libicu52'])
+                                'libicu52',
+                                'libnettle6'])
 
 def packages(name, packages, f):
     s = '%s: ' % name
@@ -237,8 +233,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
-            ('libdcp', '81ed0eb'),
-            ('libsub', '067c21c'))
+            ('libdcp', 'd23e6e1'),
+            ('libsub', 'ef7c2ec'))
 
 def configure_options(target):
     opt = ''
@@ -255,6 +251,10 @@ def configure_options(target):
             elif target.version == '7':
                 opt += ' --workaround-gssapi --static-xmlpp'
 
+    # Build Windows debug versions with static linking as I think gdb works better then
+    if target.debug and target.platform == 'windows':
+        opt += ' --static-dcpomatic'
+
     return opt
 
 def build(target, options):
@@ -364,7 +364,7 @@ def package(target, version):
             return package_rpm(target, cpu, version)
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
-        return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])
+        return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
 
 def make_pot(target):
     target.command('./waf pot')