X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=6072dc1cd1afc94c3cb7c85e236b4397540ac9f5;hb=61b2026a6d676125f6b7e02d8a81e9aed59e9ce8;hp=a5bf45554b8a62a0c55bb42f2de3c6bf236e9a0b;hpb=0767b8dda3b788f9b72c8d3cd2b68d032b5f9577;p=dcpomatic.git

diff --git a/cscript b/cscript
index a5bf45554..6072dc1cd 100644
--- a/cscript
+++ b/cscript
@@ -301,7 +301,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_verify', 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)
+        print('%attr(4755, root, root) %{_bindir}/dcpomatic2_disk_writer', file=f)
     print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
@@ -388,7 +388,7 @@ def dependencies(target, options):
 
     deps.append(('libdcp', '6384002'))
     deps.append(('libsub', '55ebde1'))
-    deps.append(('leqm-nrt', '131f971'))
+    deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
     # also need a patched openssl binary to make certificates.
@@ -703,7 +703,8 @@ 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':
-        target.command('bash platform/osx/make_dmg.sh %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
+        archs = ' '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets)
+        target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs))
         packages = []
         for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'):
             a = os.path.abspath(x)
@@ -719,6 +720,8 @@ def package(target, version, options):
                 packages.append((a, "com.dcpomatic.server"))
             elif x.find("Disk Writer") != -1:
                 packages.append((a, "com.dcpomatic.disk"))
+            elif x.find("Combiner") != -1:
+                packages.append((a, "com.dcpomatic.combiner"))
             else:
                 packages.append((a, "com.dcpomatic"))
         return packages