Require lib64canberra-gtk0 on Mageia.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 93e202c628a0c5cf3b76d73a89979d3c2efdaa24..896d8b3f8045d35b6591048560a3958a884d0e40 100644 (file)
--- a/cscript
+++ b/cscript
@@ -218,6 +218,8 @@ def can_build_disk(target):
             return True
         if target.distro == 'centos' and target.version == '8':
             return True
+        if target.distro == 'mageia':
+            return True
     return False
 
 def packages(name, packages, f):
@@ -388,7 +390,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.
@@ -625,7 +627,7 @@ def package_rpm(target, cpu, version, options):
 
     requires = None
     if target.distro == 'mageia':
-        requires = "lib64xmlsec1-devel"
+        requires = "lib64xmlsec1-devel lib64canberra-gtk0"
 
     make_spec('build/platform/linux/dcpomatic2.spec', version, target, options, requires)
     cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir
@@ -703,7 +705,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 +722,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