Basic and rather clumsy option to respect KDM validity windows.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 47efefdba4761f1bee44de3ec9e7c5aae3b5ff42..04c27781eb065b3386d63ec70426006605f6cd9d 100644 (file)
--- a/cscript
+++ b/cscript
@@ -325,11 +325,14 @@ def dependencies(target):
 
     if target.platform == 'windows' and target.version == 'xp':
         deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
-    else:
+    elif target.platform != 'linux' or target.distro != 'arch':
         deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)]
+    else:
+        # Use distro-provided FFmpeg on Arch
+        deps = []
 
-    deps.append(('libdcp', 'f2f2a2a'))
-    deps.append(('libsub', 'c2d6d92'))
+    deps.append(('libdcp', 'ee05b1c'))
+    deps.append(('libsub', '1cf5cdf'))
     deps.append(('rtaudio-cdist', '739969e'))
 
     return deps
@@ -369,40 +372,41 @@ def configure_options(target, options):
 def build(target, options):
     if target.platform == 'flatpak':
         target.checkout_dependencies()
+        prefix = 'https://dcpomatic.com/deps'
         modules = []
         modules.append({'name': 'libzip',
                         'buildsystem': 'cmake',
                         'sources': [{'type': 'archive',
-                                     'url': 'https://libzip.org/download/libzip-1.4.0.tar.xz',
+                                     'url': '%s/libzip-1.4.0.tar.xz' % prefix,
                                     'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]})
         modules.append({'name': 'imagemagick',
                         'cleanup': ['/bin'],
                         'sources': [{'type': 'archive',
-                                    'url': 'https://www.imagemagick.org/download/ImageMagick-7.0.8-10.tar.bz2',
-                                    'sha256': 'f9d99573f8b8d7f90319fdf22a1a41a6764ac247b1c3f6ae08d9a3657ec977a5'}]})
+                                    'url': '%s/ImageMagick-7.0.8-11.tar.bz2' % prefix,
+                                    'sha256': 'a1aef96c89a9a9fac51a6e141deffa0b2f8db2062a24f6ba9fe3846dde7491ac'}]})
         modules.append({'name': 'libsigc++',
                         'sources': [{'type': 'archive',
-                                     'url': 'https://download.gnome.org/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz',
+                                     'url': '%s/libsigc++-2.10.0.tar.xz' % prefix,
                                      'sha256': 'f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81'}]})
         modules.append({'name': 'glibmm',
                         'sources': [{'type': 'archive',
-                                     'url': 'http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.48/glibmm-2.48.1.tar.xz',
+                                     'url': '%s/glibmm-2.48.1.tar.xz' % prefix,
                                      'sha256': 'dc225f7d2f466479766332483ea78f82dc349d59399d30c00de50e5073157cdf'}]})
         modules.append({'name': 'cairomm',
                         'sources': [{'type': 'archive',
-                                     'url': 'https://www.cairographics.org/releases/cairomm-1.12.2.tar.gz',
+                                     'url': '%s/cairomm-1.12.2.tar.gz' % prefix,
                                      'sha256': '45c47fd4d0aa77464a75cdca011143fea3ef795c4753f6e860057da5fb8bd599'}]})
         modules.append({'name': 'pangomm',
                        'sources': [{'type': 'archive',
-                                    'url': 'http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.40/pangomm-2.40.1.tar.xz',
+                                    'url': '%s/pangomm-2.40.1.tar.xz' % prefix,
                                     'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]})
        modules.append({'name': 'libxml++',
                        'sources': [{'type': 'archive',
-                                    'url': 'https://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-2.40.1.tar.xz',
+                                    'url': '%s/libxml++-2.40.1.tar.xz' % prefix,
                                     'sha256': '4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9'}]})
         modules.append({'name': 'xmlsec1',
                        'sources': [{'type': 'archive',
-                                    'url': 'http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.25.tar.gz',
+                                    'url': '%s/xmlsec1-1.2.25.tar.gz' % prefix,
                                     'sha256': '967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2'}]})
        modules.append({'name': 'openjpeg2',
                        'buildsystem': 'cmake',
@@ -414,7 +418,7 @@ def build(target, options):
                            './b2 install'
                        ],
                        'sources': [{'type': 'archive',
-                                    'url': 'https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2',
+                                    'url': '%s/boost_1_66_0.tar.bz2' % prefix,
                                     'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]})
        modules.append({'name': 'asdcplib',
                        'buildsystem': 'simple',
@@ -457,13 +461,13 @@ def build(target, options):
                        'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]})
        modules.append({'name': 'wxwidgets',
                        'sources': [{'type': 'archive',
-                                    'url': 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3/wxWidgets-3.0.3.tar.bz2',
+                                    'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix,
                                     'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]})
        modules.append({'name': 'libssh',
                        'buildsystem': 'cmake',
                        'builddir': True,
                        'sources': [{'type': 'archive',
-                                    'url': 'https://www.libssh.org/files/0.7/libssh-0.7.5.tar.xz',
+                                    'url': '%s/libssh-0.7.5.tar.xz' % prefix,
                                     'sha256': '54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'}]})
        modules.append({'name': 'dcpomatic',
                        'buildsystem': 'simple',