Fix transcode finish time estimations when re-encoding a DCP (#1863).

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 6c70828f795cb3afdf888f22d700b285b6d3167b..634f343e8585e679a05524a9eec3a232bbc1fd73 100644 (file)
--- a/cscript
+++ b/cscript
@@ -285,9 +285,6 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_playlist', file=f)
     print('%{_bindir}/dcpomatic2_openssl', file=f)
     print('%{_bindir}/dcpomatic2_combiner', file=f)
-    if options['variant'] == 'swaroop-studio':
-        print('%{_bindir}/dcpomatic2_ecinema', file=f)
-        print('%{_bindir}/dcpomatic2_uuid', file=f)
     if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
         print('%{_bindir}/dcpomatic2_disk', file=f)
         print('%{_bindir}/dcpomatic2_disk_writer', file=f)
@@ -328,6 +325,8 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
+    print('%{_datadir}/libdcp/tags/*', file=f)
+    print('%{_datadir}/libdcp/xsd/*', file=f)
     print('', file=f)
     print('%prep', file=f)
     print('rm -rf $RPM_BUILD_DIR/dcpomatic-%s' % version, file=f)
@@ -342,6 +341,9 @@ def make_spec(filename, version, target, options, requires=None):
     print('cd dcpomatic-%s' % version, file=f)
     print('./waf install', file=f)
     print('/bin/cp %s/src/openssl/apps/openssl %%{buildroot}/usr/bin/dcpomatic2_openssl' % target.directory, file=f)
+    print('/bin/mkdir -p %{buildroot}/usr/share/libdcp', file=f)
+    print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
+    print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
     print('', file=f)
     print('%post', file=f)
     print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
@@ -373,8 +375,8 @@ def dependencies(target, options):
             (target.platform == 'osx' and target.bits == 64) or
             (target.platform == 'windows')) else {}
 
-    deps.append(('libdcp', 'b636c3e', cpp_lib_options))
-    deps.append(('libsub', '6514f5b', cpp_lib_options))
+    deps.append(('libdcp', '2b522d0', cpp_lib_options))
+    deps.append(('libsub', 'dcd8bf5', cpp_lib_options))
     deps.append(('leqm-nrt', 'carl'))
     deps.append(('rtaudio', 'carl'))
     # We get our OpenSSL libraries from the environment, but we
@@ -740,11 +742,11 @@ def make_manual(target):
 def test(target, options, test):
     target.set('LC_ALL', 'C')
     if target.platform == 'windows':
-        cmd = 'run\\tests'
+        cmd = 'run\\tests '
     else:
         cmd = 'run/tests '
     if target.debug:
         cmd += '--backtrace '
     if test is not None:
-        cmd += '--run_test=%s' % test
+        cmd += '-t %s' % test
     target.command(cmd)