Bump libsub for SSA Margin{L,R} support (#2811).

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 84b6076e6e845f1c8882249b165036c19b3c5f01..1e831ba47c92cc83ae9ff7942b7a76fd99629ab1 100644 (file)
--- a/cscript
+++ b/cscript
@@ -457,7 +457,8 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_datadir}/dcpomatic2/zoom_black.png', file=f)
     print('%{_datadir}/dcpomatic2/zoom_all_white.png', file=f)
     print('%{_datadir}/dcpomatic2/zoom_all_black.png', file=f)
     print('%{_datadir}/dcpomatic2/zoom_black.png', file=f)
     print('%{_datadir}/dcpomatic2/zoom_all_white.png', file=f)
     print('%{_datadir}/dcpomatic2/zoom_all_black.png', file=f)

-    print('%{_datadir}/dcpomatic2/link.png', file=f)
+    print('%{_datadir}/dcpomatic2/link_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/link_white.png', file=f)

     print('%{_datadir}/dcpomatic2/me.jpg', file=f)
     print('%{_datadir}/dcpomatic2/add_black.png', file=f)
     print('%{_datadir}/dcpomatic2/add_white.png', file=f)
     print('%{_datadir}/dcpomatic2/me.jpg', file=f)
     print('%{_datadir}/dcpomatic2/add_black.png', file=f)
     print('%{_datadir}/dcpomatic2/add_white.png', file=f)


@@ -534,8 +535,8 @@ 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(('libsub', 'v1.6.47'))
+    deps.append(('libdcp', 'v1.8.100'))
+    deps.append(('libsub', 'v1.6.49'))

     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we


@@ -588,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
 


@@ -787,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 = []
 


@@ -922,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: