Bump libdcp to one with some cleanups / header re-arrangement.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 59fcc5e751f94211ca4d5bcd5b4be60a4ddf15a2..0f5daa30845fb176b265430310cef38cee717186 100644 (file)
--- a/cscript
+++ b/cscript
@@ -451,7 +451,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_combiner.png' % r, file=f)
     for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK',
-              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'sl_SI', 'hu_HU']:
+              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'sl_SI', 'hu_HU', 'ka_KA']:
         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)
@@ -506,7 +506,7 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.73'))
+    deps.append(('libdcp', '9f7980e15f14c0d5f6b59e53b9bf939e62df20c9'))
     deps.append(('libsub', 'v1.6.44'))
     deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
     deps.append(('rtaudio', 'f619b76'))
@@ -857,28 +857,7 @@ def package(target, version, options):
         if 'part' in options:
             cmd += ' -b ' + options['part']
         target.command(cmd)
-        packages = []
-        for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'):
-            a = os.path.abspath(x)
-            if x.find("Player") != -1:
-                packages.append((a, "com.dcpomatic.player"))
-            elif x.find("Playlist Editor") != -1:
-                packages.append((a, "com.dcpomatic.playlist"))
-            elif x.find("KDM Creator") != -1:
-                packages.append((a, "com.dcpomatic.kdm"))
-            elif x.find("Batch Converter") != -1:
-                packages.append((a, "com.dcpomatic.batch"))
-            elif x.find("Encode Server") != -1:
-                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"))
-            elif x.find("Editor") != -1:
-                packages.append((a, "com.dcpomatic.editor"))
-            else:
-                packages.append((a, "com.dcpomatic"))
-        return packages
+        return glob.glob('build/platform/osx/DCP-o-matic*.dmg')
     elif target.platform == 'docker':
         shutil.copyfile(target.deb, 'build/platform/docker')
         f = open('build/platform/docker/Dockerfile', 'w')