X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=1d99e27c9153d74f377af8976b29c919d324e134;hb=ce12e6c391ac87f5468b88844c36a61183d2d099;hp=69aa855aaef8a5f98c09aed1007aae9f13823a69;hpb=f09e516b90f0b097c949926831ad1bc282ba41f7;p=dcpomatic.git

diff --git a/cscript b/cscript
index 69aa855aa..1d99e27c9 100644
--- a/cscript
+++ b/cscript
@@ -32,8 +32,6 @@ 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['17.04'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['17.04'].extend(['libssh-dev'])
 deb_build_depends['17.10'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['17.10'].extend(['libssh-dev'])
 deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base)
@@ -79,20 +77,6 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libssh-4',
                              'libx264-148'])
 
-deb_depends['17.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['17.04'].extend(['libboost-filesystem1.62.0',
-                             'libboost-thread1.62.0',
-                             'libboost-regex1.62.0',
-                             'libmagick++-6.q16-7',
-                             'libxml++2.6-2v5',
-                             'libboost-date-time1.62.0',
-                             'libzip4',
-                             'libwxgtk3.0-0v5',
-                             'libicu57',
-                             'libnettle6',
-                             'libssh-4',
-                             'libx264-148'])
-
 deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
 deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
                              'libboost-thread1.62.0',
@@ -149,9 +133,18 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libxml++2.6-2v5',
                          'libgtk2.0-0',
                          'libzip4',
+                         'libcairomm-1.0-1v5',
+                         'libpangomm-1.4-1v5',
+                         'libwxgtk3.0-0v5',
+                         'libxcb-xfixes0',
+                         'libxcb-shape0',
+                         'libasound2',
                          'libicu57',
+                         'libssh-4',
+                         'libssh-gcrypt-4',
                          'libnettle6',
-                         'libx264-148'])
+                         'libx264-148',
+                         'libpulse0'])
 
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
 deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
@@ -290,8 +283,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
-            ('libdcp', '0c70427'),
-            ('libsub', '7f68281'),
+            ('libdcp', '0a47e4c'),
+            ('libsub', '688c501'),
             ('rtaudio-cdist', None))
 
 def configure_options(target):
@@ -308,6 +301,11 @@ def configure_options(target):
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
                 opt += ' --workaround-gssapi'
+                # Centos 7 ships with glibmm 2.50.0 which requires C++11
+                # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
+                # I worry that this will cause ABI problems but I don't have
+                # a better solution.
+                opt += ' --force-cpp11'
 
     # Build Windows debug versions with static linking as I think gdb works better then
     if target.debug and target.platform == 'windows':