Bump libdcp for CPL root element namespace fix.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 6869e25d7854751e340d478f416eba4dc5fc593d..8703bf22e8b2abd4606e11566f359465c11578a5 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -37,12 +37,16 @@ deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['18.04'].extend(['libssh-dev'])
 deb_build_depends['18.10'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['18.10'].extend(['libssh-dev'])
+deb_build_depends['19.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['19.04'].extend(['libssh-dev'])
 deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['7'].extend(['libssh-dev'])
 deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['8'].extend(['libssh-gcrypt-dev'])
 deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['9'].extend(['libssh-gcrypt-dev'])
+deb_build_depends['10'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['10'].extend(['libssh-gcrypt-dev'])
 deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
 
 deb_depends = dict()
@@ -115,6 +119,23 @@ deb_depends['18.10'].extend(['libboost-filesystem1.65.1',
                              'libcurl4',
                              'libpulse0'])
 
+deb_depends['19.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['19.04'].extend(['libboost-filesystem1.67.0',
+                             'libboost-thread1.67.0',
+                             'libboost-regex1.67.0',
+                             'libboost-date-time1.67.0',
+                             'libcairomm-1.0-1v5',
+                             'libpangomm-1.4-1v5',
+                             'libxml++2.6-2v5',
+                             'libzip5',
+                             'libwxgtk3.0-0v5',
+                             'libicu63',
+                             'libnettle6',
+                             'libssh-4',
+                             'libx264-155',
+                             'libcurl4',
+                             'libpulse0'])
+
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
                          'libboost-thread1.49.0',
@@ -171,18 +192,41 @@ deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5',
                          'libasound2',
                          'libpulse0' ]
 
+deb_depends['10'] = copy.deepcopy(deb_depends_base)
+deb_depends['10'].extend(['libboost-filesystem1.67.0',
+                          'libboost-thread1.67.0',
+                          'libboost-regex1.67.0',
+                          'libboost-date-time1.67.0',
+                          'libxml++2.6-2v5',
+                          'libgtk2.0-0',
+                          'libzip4',
+                          'libcairomm-1.0-1v5',
+                          'libpangomm-1.4-1v5',
+                          'libicu63',
+                          'libssh-4',
+                          'libssh-gcrypt-4',
+                          'libnettle6',
+                          'libx264-155',
+                          'libcurl4'])
+
+deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5',
+                          'libxcb-xfixes0',
+                          'libxcb-shape0',
+                          'libasound2',
+                          'libpulse0' ]
+
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
-deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
-                                'libboost-thread1.62.0',
-                                'libboost-regex1.62.0',
-                                'libboost-date-time1.62.0',
+deb_depends['unstable'].extend(['libboost-filesystem1.67.0',
+                                'libboost-thread1.67.0',
+                                'libboost-regex1.67.0',
+                                'libboost-date-time1.67.0',
                                 'libxml++2.6-2v5',
                                 'libgtk2.0-0',
                                 'libzip4',
-                                'libicu57',
+                                'libicu63',
                                 'libnettle6',
-                                'libx264-148',
-                                'libcurl3'])
+                                'libx264-155',
+                                'libcurl4'])
 
 def packages(name, packages, f):
     s = '%s: ' % name
@@ -273,6 +317,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_datadir}/dcpomatic2/zoom_all.png', file=f)
     print('%{_datadir}/dcpomatic2/tick.png', file=f)
     print('%{_datadir}/dcpomatic2/no_tick.png', file=f)
+    print('%{_datadir}/dcpomatic2/me.jpg', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f)
@@ -285,7 +330,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.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', 'fi_FI']:
+              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'ko_KR']:
         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)
@@ -331,9 +376,9 @@ def dependencies(target):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.6.5'))
-    deps.append(('libsub', 'v1.4.4'))
-    deps.append(('rtaudio-cdist', 'aad62d7'))
+    deps.append(('libdcp', 'v1.6.9'))
+    deps.append(('libsub', 'v1.4.10'))
+    deps.append(('rtaudio-cdist', 'bf0fc23'))
 
     return deps
 
@@ -508,7 +553,7 @@ def package_windows(target):
     target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier))
     target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, identifier))
     target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, identifier))
-    target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, identifier))
+    target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.environment_prefix, identifier))
     target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier))
     target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % identifier)
     target.command('makensis build/platform/windows/installer2.%s.nsi' % identifier)
@@ -615,6 +660,7 @@ def package(target, version, options):
             out.append(make_appimage(target, 'DCP-o-matic Playlist Editor', 'dcpomatic2_playlist', version))
             out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version))
             out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version))
+            out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version))
             return out
         else:
             if target.bits == 32: