X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=e256d1635d81622080a278b7d2579fa8f1e2cf32;hb=f9af170a6240b78bff122c8217b97ea38f3124bd;hp=edeaf00cecfc215a560ef11f02240aa0cfa97541;hpb=f9b8a63be73341e69677e10c96e9d2240698a76d;p=dcpomatic.git

diff --git a/cscript b/cscript
index edeaf00ce..e256d1635 100644
--- a/cscript
+++ b/cscript
@@ -28,16 +28,14 @@ deb_build_depends = dict()
 
 deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev']
 
-deb_build_depends['12.04'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['12.04'].extend(['libssh-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['16.10'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['16.10'].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)
 deb_build_depends['7'].extend(['libssh-dev'])
 deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
@@ -81,13 +79,13 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libssh-4',
                              'libx264-148'])
 
-deb_depends['16.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['16.10'].extend(['libboost-filesystem1.61.0',
-                             'libboost-thread1.61.0',
-                             'libboost-regex1.61.0',
-                             'libmagick++-6.q16-5v5',
+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.61.0',
+                             'libboost-date-time1.62.0',
                              'libzip4',
                              'libwxgtk3.0-0v5',
                              'libicu57',
@@ -95,8 +93,8 @@ deb_depends['16.10'].extend(['libboost-filesystem1.61.0',
                              'libssh-4',
                              'libx264-148'])
 
-deb_depends['17.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['17.04'].extend(['libboost-filesystem1.62.0',
+deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
                              'libboost-thread1.62.0',
                              'libboost-regex1.62.0',
                              'libmagick++-6.q16-7',
@@ -292,8 +290,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
-            ('libdcp', '8b72edd'),
-            ('libsub', '05c6345'),
+            ('libdcp', '4bdc3a8'),
+            ('libsub', '3b9dd0a'),
             ('rtaudio-cdist', None))
 
 def configure_options(target):
@@ -310,6 +308,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':
@@ -416,7 +419,7 @@ def package(target, version):
 
         if target.distro == 'debian' or target.distro == 'ubuntu':
             return package_debian(target, cpu, version)
-        elif target.distro == 'centos' or target.distro == 'fedora':
+        elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
             return package_rpm(target, cpu, version)
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh %s' % target.directory)