Emit no audio from DCPs if none is mapped

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index f70b55568a3eac25412be1a47a448fa33f263e7e..eb2c8e4364ceb19287eca839beabc46f732d4b81 100644 (file)
--- a/cscript
+++ b/cscript
@@ -535,7 +535,7 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
         # Use distro-provided FFmpeg on Arch
         deps = []
 

-    deps.append(('libdcp', 'v1.8.97'))
+    deps.append(('libdcp', 'v1.8.100'))

     deps.append(('libsub', 'v1.6.47'))
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))
     deps.append(('libsub', 'v1.6.47'))
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))


@@ -589,7 +589,7 @@ def configure_options(target, options, for_package=False):
         opt += ' --enable-disk'
 
     if target.platform == 'osx' and target.arch == 'arm64':
         opt += ' --enable-disk'
 
     if target.platform == 'osx' and target.arch == 'arm64':

-        opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin
+        opt += ' --wx-config=%s/wx-config' % target.bin

 
     return opt
 
 
     return opt
 


@@ -788,6 +788,8 @@ def package_rpm(target, cpu, version, options):
 
     make_spec('dcpomatic2.spec', version, target, options, requires)
     cmd = 'rpmbuild --define "_topdir %s" -bb dcpomatic2.spec' % topdir
 
     make_spec('dcpomatic2.spec', version, target, options, requires)
     cmd = 'rpmbuild --define "_topdir %s" -bb dcpomatic2.spec' % topdir

+    # On Centos 7 we build and install boost ourselves, so we must look for it in the right place
+    target.set('LINKFLAGS', '-L/usr/local/lib')

     target.command(cmd)
     rpms = []
 
     target.command(cmd)
     rpms = []
 


@@ -923,7 +925,11 @@ def test(target, options, test):
     if target.platform == 'windows':
         cmd = 'run\\tests '
     else:
     if target.platform == 'windows':
         cmd = 'run\\tests '
     else:

-        cmd = 'run/tests --check --log_level=test_suite '
+        cmd = 'run/tests '
+    if target.environment_prefix:
+        cmd += '-e %s ' % target.environment_prefix
+    if target.platform != 'windows':
+        cmd += ' --check --log_level=test_suite '

     if target.debug:
         cmd += '--backtrace '
     if test is not None:
     if target.debug:
         cmd += '--backtrace '
     if test is not None: