Fix Linux build.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 3d437ca5d2760f81a459e79a2404d100de25da91..0f8241c494b1ab66ac275d2b6dcb1803ed4c2872 100644 (file)
--- 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', 'b221efe'))
+    deps.append(('libsub', '4518eac'))
     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', '01c7d4c'))
+        deps.append(('lwext4', '3601ea5'))
     deps.append(('ffcmp', 'a915540'))
 
     return deps
@@ -689,15 +684,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)