Test reference tweaks.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 32a10e30b0c5342e321129d308957a9301d598d2..18b9b71ae9c1ee44738f57e6eda1559b56b2c635 100644 (file)
--- a/cscript
+++ b/cscript
@@ -370,22 +370,17 @@ 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', '9b6997a'))
+    deps.append(('libsub', '3d2a513'))
     deps.append(('leqm-nrt', '131f971'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
     # also need a patched openssl binary to make certificates.
     # This dependency is to get that binary, which is added into
     # the appropriate place later
-    deps.append(('openssl', '0b7b7f1'))
+    deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
-        deps.append(('lwext4', '01c7d4c'))
+        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)