Bump libdcp for fix to GH #20, a spurious rejection of a KDM.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index c62056558418e3e2501a2ba87bf8a8897138e45a..75a6aa6c5d68c11c9f06460a0cd673afe911e225 100644 (file)
--- a/cscript
+++ b/cscript
@@ -44,6 +44,9 @@ for v in ['9', '10']:
 for v in ['11']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.9'])
+for v in ['12']:
+    deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+    deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.11'])
 deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['unstable'].extend(['python3'])
 
@@ -251,6 +254,29 @@ deb_depends_gui['11'] = [ 'libxcb-xfixes0',
                           'libasound2',
                           'libpulse0' ]
 
+deb_depends['12'] = copy.deepcopy(deb_depends_base)
+deb_depends['12'].extend(['libboost-filesystem1.74.0',
+                          'libboost-thread1.74.0',
+                          'libboost-regex1.74.0',
+                          'libboost-date-time1.74.0',
+                          'libxml++2.6-2v5',
+                          'libzip4',
+                          'libcairomm-1.0-1v5',
+                          'libpangomm-1.4-1v5',
+                          'libicu72',
+                          'libssh-4',
+                          'libssh-gcrypt-4',
+                          'libnettle8',
+                          'libx264-164',
+                          'libcurl4',
+                          'libxerces-c3.2',
+                          'libnanomsg5'])
+
+deb_depends_gui['12'] = [ 'libxcb-xfixes0',
+                          'libxcb-shape0',
+                          'libasound2',
+                          'libpulse0' ]
+
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
 deb_depends['unstable'].extend(['libboost-filesystem1.67.0',
                                 'libboost-thread1.67.0',
@@ -425,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)
@@ -475,12 +501,12 @@ def dependencies(target, options):
         ffmpeg_options = {}
 
     if target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg', '2fb5e99b45e92880bd7953cb98c2027a34884c14', ffmpeg_options)]
+        deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.72'))
+    deps.append(('libdcp', 'v1.8.82'))
     deps.append(('libsub', 'v1.6.44'))
     deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
     deps.append(('rtaudio', 'f619b76'))
@@ -491,7 +517,7 @@ def dependencies(target, options):
     deps.append(('openssl', '7f29dd5'))
     if can_build_disk(target):
         deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f'))
-    deps.append(('ffcmp', '15e7fdf0b3896e3f7323a950105382a9c8ae3c39'))
+    deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237'))
 
     return deps
 
@@ -831,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')