Support more detailed horizontal positioning coming from libsub.
[dcpomatic.git] / cscript
diff --git a/cscript b/cscript
index c5accebbb323ee05bd3eefc5ad91363f906d0389..6daf34f14279812a695d8c6be93df0b603d6bb8f 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -24,22 +24,31 @@ import shutil
 import os
 import copy
 
-deb_build_depends = {'debhelper', 'python', 'g++', 'pkg-config', 'libssh-dev', 'libsndfile1-dev', 'libgtk2.0-dev'}
+deb_build_depends = dict()
+
+deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev']
+
+deb_build_depends['12.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['12.04'].extend(['libssh-dev'])
+deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['14.04'].extend(['libssh-dev'])
+deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['16.04'].extend(['libssh-dev'])
+deb_build_depends['16.10'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['16.10'].extend(['libssh-dev'])
+deb_build_depends['17.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['17.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['unstable'] = copy.deepcopy(deb_build_depends_base)
 
 deb_depends = dict()
 
-deb_depends_base = ['libc6', 'libssh-4', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0']
-
-deb_depends['12.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['12.04'].extend(['libboost-filesystem1.48.0',
-                             'libboost-thread1.48.0',
-                             'libboost-regex1.48.0',
-                             'libmagick++4',
-                             'libxml++2.6-2',
-                             'libboost-date-time1.48.0',
-                             'libzip2',
-                             'libicu48',
-                             'libnettle4'])
+deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0']
 
 deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
@@ -50,9 +59,11 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
                              'libboost-date-time1.54.0',
                              'libzip2',
                              'libcairomm-1.0-1',
-                             'libpangomm-1.4-1',
+                             'libpangomm-1.4-1,'
                              'libicu52',
-                             'libnettle4'])
+                             'libnettle4',
+                             'libssh-4',
+                             'libx264-142'])
 
 deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
@@ -62,9 +73,41 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libxml++2.6-2v5',
                              'libboost-date-time1.58.0',
                              'libzip4',
+                             'libcairomm-1.0-1v5',
+                             'libpangomm-1.4-1v5',
                              'libwxgtk3.0-0v5',
                              'libicu55',
-                             'libnettle6'])
+                             'libnettle6',
+                             'libssh-4',
+                             'libx264-148'])
+
+deb_depends['16.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['16.10'].extend(['libboost-filesystem1.61.0',
+                             'libboost-thread1.61.0',
+                             'libboost-regex1.61.0',
+                             'libmagick++-6.q16-5v5',
+                             'libxml++2.6-2v5',
+                             'libboost-date-time1.61.0',
+                             'libzip4',
+                             'libwxgtk3.0-0v5',
+                             'libicu57',
+                             'libnettle6',
+                             'libssh-4',
+                             'libx264-148'])
+
+deb_depends['17.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['17.04'].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',
+                             'libwxgtk3.0-0v5',
+                             'libicu57',
+                             'libnettle6',
+                             'libssh-4',
+                             'libx264-148'])
 
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
@@ -78,7 +121,8 @@ deb_depends['7'].extend(['libboost-filesystem1.49.0',
                              'libpangomm-1.4-1',
                              'libicu48',
                              'libnettle4',
-                             'libnotify4'])
+                             'libnotify4',
+                             'libx264-123'])
 
 deb_depends['8'] = copy.deepcopy(deb_depends_base)
 deb_depends['8'].extend(['libboost-filesystem1.55.0',
@@ -88,23 +132,41 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libmagick++-6.q16-5',
                          'libxml++2.6-2',
                          'libzip2',
+                         'libcairomm-1.0-1',
+                         'libpangomm-1.4-1',
                          'libwxgtk3.0-0',
                          'libxcb-xfixes0',
                          'libxcb-shape0',
                          'libicu52',
-                         'libnettle4'])
+                         'libnettle4',
+                         'libssh-4',
+                         'libx264-142'])
+
+deb_depends['9'] = copy.deepcopy(deb_depends_base)
+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',
+                         'libicu57',
+                         'libnettle6',
+                         'libx264-148'])
 
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
-deb_depends['unstable'].extend(['libboost-filesystem1.58.0',
-                                'libboost-thread1.58.0',
-                                'libboost-regex1.58.0',
-                                'libmagick++-6.q16-5v5',
+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',
-                                'libboost-date-time1.58.0',
-                                'libzip2',
-                                'libicu52',
-                                'libnettle6'])
+                                'libzip4',
+                                'libicu57',
+                                'libnettle6',
+                                'libx264-148'])
 
 def packages(name, packages, f):
     s = '%s: ' % name
@@ -118,7 +180,7 @@ def make_control(debian_version, bits, filename, debug):
     print('Section: video', file=f)
     print('Priority: extra', file=f)
     print('Maintainer: Carl Hetherington <carl@dcpomatic.com>', file=f)
-    packages('Build-Depends', deb_build_depends, f)
+    packages('Build-Depends', deb_build_depends[debian_version], f)
     print('Standards-Version: 3.9.3', file=f)
     print('Homepage: http://dcpomatic.com/', file=f)
     print('', file=f)
@@ -232,9 +294,10 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
-            ('libdcp', '0acd045'),
-            ('libsub', '3db5052'))
+    return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
+            ('libdcp', '047d8ff'),
+            ('libsub', 'ec880ed'),
+            ('rtaudio-cdist', None))
 
 def configure_options(target):
     opt = ''
@@ -245,11 +308,15 @@ def configure_options(target):
     elif target.platform == 'linux':
         opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':
-            opt += ' --static-xmlsec --static-ssh --disable-tests'
+            opt += ' --disable-tests'
             if target.version == '6.5':
                 opt += ' --static-boost --static-xmlpp'
             elif target.version == '7':
-                opt += ' --workaround-gssapi --static-xmlpp'
+                opt += ' --workaround-gssapi'
+
+    # Build Windows debug versions with static linking as I think gdb works better then
+    if target.debug and target.platform == 'windows':
+        opt += ' --static-dcpomatic'
 
     return opt
 
@@ -296,10 +363,10 @@ def package_debian(target, cpu, version):
     target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"')
     if target.debug:
         target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
-    if target.version in ['15.04', '15.10', '16.04', '8']:
-        target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
-    else:
+    if target.version in ['7', '14.04']:
         target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')
+    else:
+        target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
 
     target.command('dpkg-buildpackage -uc -us')
 
@@ -360,7 +427,22 @@ def package(target, version):
             return package_rpm(target, cpu, version)
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
-        return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])
+        return [os.path.abspath(x) for x in 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')
+        print('FROM debian:jessie', file=f)
+        print('MAINTAINER carl@dcpomatic.com', file=f)
+        print('ADD build/platform/docker/dcpomatic_%s-1_amd64.deb /tmp' % (version, version), file=f)
+        print('RUN apt-get -o Acquire:http::Timeout="5" update; exit 0', file=f)
+        print('RUN dpkg -i /tmp/dcpomatic_*.deb; exit 0', file=f)
+        print('RUN apt-get -y -f install', file=f)
+        print('RUN apt-get clean', file=f)
+        print('EXPOSE 6192', file=f)
+        print('CMD ["/usr/bin/dcpomatic2_server_cli", "--verbose"]', file=f)
+        f.close()
+        target.command('docker build build/platform/docker -t dcpomatic-server:%s' % version)
+        target.command('docker save dcpomatic-server:%s -o dcpomatic-server-%s-docker.tar' % (version, version))
 
 def make_pot(target):
     target.command('./waf pot')