X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=52e3fe406103020d2facd382c8a28ba3c01012a8;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=87ea1162207574271193d4d434ac2858a2671bbe;hpb=8f4b45d7e3c83d390fb77728f84d6984d0650a05;p=dcpomatic.git

diff --git a/cscript b/cscript
index 87ea11622..52e3fe406 100644
--- a/cscript
+++ b/cscript
@@ -370,13 +370,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    # Let's use C++11 mode if we can
-    cpp_lib_options = {'force-cpp11': True} if (
-            (target.platform == 'osx') or
-            (target.platform == 'windows')) else {}
-
-    deps.append(('libdcp', 'c6665c1', cpp_lib_options))
-    deps.append(('libsub', '64eb116', cpp_lib_options))
+    deps.append(('libdcp', 'e5f89bf'))
+    deps.append(('libsub', '948df33'))
     deps.append(('leqm-nrt', '131f971'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -385,7 +380,7 @@ def dependencies(target, options):
     # the appropriate place later
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
-        deps.append(('lwext4', 'f2a1573'))
+        deps.append(('lwext4', '3601ea5'))
     deps.append(('ffcmp', 'a915540'))
 
     return deps
@@ -412,13 +407,6 @@ def configure_options(target, options):
                 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'
-    elif target.platform == 'osx':
-        opt += ' --force-cpp11'
 
     if not options['gui']:
         opt += ' --disable-gui'
@@ -689,15 +677,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':
-        name = ''
-        if hasattr(target, 'archs') and sorted(target.archs) == sorted(('arm64', 'x86_64')):
-            name = 'arm-intel'
-        elif hasattr(target, 'arch'):
-            if target.arch == 'x86_64':
-                name = 'intel'
-            elif target.arch == 'arm64':
-                name = 'arm'
-        target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s %s' % (target.environment_prefix, target.directory, name, target.sdk, target.apple_id, target.apple_password))
+        target.command('bash platform/osx/make_dmg.sh %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
         packages = []
         for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'):
             a = os.path.abspath(x)