Fix crash on startup on macOS.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 2ff9a8b6f81af4d4bf7031346812e9a4c7515837..6e9f4da5f53805c66e560ba143d66d59f3ba749b 100644 (file)
--- a/cscript
+++ b/cscript
@@ -370,8 +370,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'd39880e'))
-    deps.append(('libsub', 'ee5d2c8'))
+    deps.append(('libdcp', '8344c1c'))
+    deps.append(('libsub', '8990c30'))
     deps.append(('leqm-nrt', '131f971'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -380,7 +380,7 @@ def dependencies(target, options):
     # the appropriate place later
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
-        deps.append(('lwext4', '3601ea5'))
+        deps.append(('lwext4', '9d20ec5'))
     deps.append(('ffcmp', 'a915540'))
 
     return deps
@@ -407,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'
@@ -638,10 +631,11 @@ def make_appimage(target, nice_name, internal_name, version):
     target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename))
     target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename))
     target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename)
+    target.command('cp -r %s/share/dcpomatic2 build/%s.AppDir/usr/share/' % (target.directory, nice_filename))
     target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename))
+    target.command('cp -r %s/share/libdcp/tags build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename))
     with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f:
         print('#!/bin/bash', file=f)
-        print('export APPDIR="$(dirname "$(readlink -f "$0")")"', file=f)
         print('export PATH=$APPDIR/usr/bin:$PATH', file=f)
         print('export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS"', file=f)
         print('"$APPDIR"/usr/bin/%s $@' % internal_name, file=f)