Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 0ea616b23d8c8a9f11191c5c4b2df362e0b2b5fa..aa274e8ecef8bf0362e4a97dea2471b9ba4090e9 100644 (file)
--- a/cscript
+++ b/cscript
@@ -54,7 +54,6 @@ deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
                              'libboost-thread1.54.0',
                              'libboost-regex1.54.0',
-                             'libmagick++5',
                              'libxml++2.6-2',
                              'libboost-date-time1.54.0',
                              'libzip2',
@@ -70,7 +69,6 @@ deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libboost-thread1.58.0',
                              'libboost-regex1.58.0',
-                             'libmagick++-6.q16-5v5',
                              'libxml++2.6-2v5',
                              'libboost-date-time1.58.0',
                              'libzip4',
@@ -87,7 +85,6 @@ deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
 deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
                              'libboost-thread1.62.0',
                              'libboost-regex1.62.0',
-                             'libmagick++-6.q16-7',
                              'libxml++2.6-2v5',
                              'libboost-date-time1.62.0',
                              'libzip4',
@@ -103,7 +100,6 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libboost-thread1.65.1',
                              'libboost-regex1.65.1',
                              'libboost-date-time1.65.1',
-                             'libmagick++-6.q16-7',
                              'libcairomm-1.0-1v5',
                              'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
@@ -119,7 +115,6 @@ deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
                          'libboost-thread1.49.0',
                          'libboost-regex1.49.0',
-                         'libmagick++5',
                          'libxml++2.6-2',
                          'libboost-date-time1.49.0',
                          'libzip2',
@@ -136,7 +131,6 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libboost-thread1.55.0',
                          'libboost-date-time1.55.0',
                          'libboost-regex1.55.0',
-                         'libmagick++-6.q16-5',
                          'libxml++2.6-2',
                          'libzip2',
                          'libcairomm-1.0-1',
@@ -155,7 +149,6 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libboost-thread1.62.0',
                          'libboost-regex1.62.0',
                          'libboost-date-time1.62.0',
-                         'libmagick++-6.q16-7',
                          'libxml++2.6-2v5',
                          'libgtk2.0-0',
                          'libzip4',
@@ -179,7 +172,6 @@ deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
                                 'libboost-thread1.62.0',
                                 'libboost-regex1.62.0',
                                 'libboost-date-time1.62.0',
-                                'libmagick++-6.q16-7',
                                 'libxml++2.6-2v5',
                                 'libgtk2.0-0',
                                 'libzip4',
@@ -324,18 +316,21 @@ def dependencies(target):
         ffmpeg_options = {}
 
     if target.platform == 'windows' and target.version == 'xp':
-        deps = [('ffmpeg-cdist', '65c6d9e', ffmpeg_options)]
-    else:
+        deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
+    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', '348aaa6'))
-    deps.append(('libsub', '75d9785'))
+    deps.append(('libdcp', '7930f76'))
+    deps.append(('libsub', '7bf99dc'))
     deps.append(('rtaudio-cdist', '739969e'))
 
     return deps
 
 def option_defaults():
-    return { "gui": True }
+    return { "gui": True, "variant": None }
 
 def configure_options(target, options):
     opt = ''
@@ -360,6 +355,9 @@ def configure_options(target, options):
     if not options['gui']:
         opt += ' --disable-gui'
 
+    if options['variant'] is not None:
+        opt += ' --variant=%s' % options['variant']
+
     # Build Windows debug versions with static linking as I think gdb works better then
     if target.debug and target.platform == 'windows':
         opt += ' --static-dcpomatic'
@@ -369,40 +367,36 @@ 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'}]})
         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 +408,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 +451,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',
@@ -590,9 +584,11 @@ def make_appimage(target, nice_name, internal_name, version):
     with open('build/%s.AppDir/%s.desktop' % (nice_filename, internal_name), 'w') as f:
         print('[Desktop Entry]', file=f)
         print('Type=Application', file=f)
+        print('Categories=AudioVideo;', file=f)
         print('Name=%s' % nice_name, file=f)
         print('Icon=%s' % internal_name, file=f)
     target.command('cp graphics/linux/256/%s.png build/%s.AppDir' % (internal_name, nice_filename))
+    target.command('linuxdeploy-x86_64.AppImage --appdir build/%s.AppDir' % nice_filename)
     target.command('appimagetool-x86_64.AppImage build/%s.AppDir' % nice_filename)
     target.command('mv %s-x86_64.AppImage build/%s-%s-x86_64.AppImage' % (nice_filename, nice_filename, version))
     return os.path.abspath('build/%s-%s-x86_64.AppImage' % (nice_filename, version))