Bump libdcp for HMAC fix.
[dcpomatic.git] / cscript
diff --git a/cscript b/cscript
index 64b3ac2f859a4aeef6cb3067e5dcfa5c315cc898..fd160fc29b488dd16eb9b14c4d1117616ddd5fb6 100644 (file)
--- a/cscript
+++ b/cscript
@@ -17,6 +17,7 @@
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
+from __future__ import print_function
 import glob
 import shutil
 import os
@@ -63,6 +64,8 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libcurl3': '7.35.0-1ubuntu2',
                         'libzip2': '0.10.1-1.2',
                         'libsamplerate0': '0.1.8-7',
+                        'libcairomm-1.0-1': '1.10.0-1ubuntu3',
+                        'libpangomm-1.4-1': '2.34.0-1ubuntu1',
                         'libicu52': '52.1-3'}
 
 deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
@@ -83,6 +86,24 @@ deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libsamplerate0': '0.1.8-8',
                         'libicu52': '52.1-8'}
 
+deb_depends['15.10'] = {'libc6': '2.21-0ubuntu4',
+                        'libssh-4': '0.6.3-3ubuntu3',
+                        'libboost-filesystem1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+                        'libboost-thread1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+                        'libboost-regex1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+                        'libsndfile1': '1.0.25-9.1',
+                        'libmagick++-6.q16-5v5': '8:6.8.9.9-5ubuntu2',
+                        'libxml++2.6-2v5': '2.38.1-2',
+                        'libgtk2.0-0': '2.24.28-1ubuntu1',
+                        'libxmlsec1': '1.2.20-2ubuntu3',
+                        'libxmlsec1-openssl': '1.2.20-2ubuntu3',
+                        'libboost-date-time1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+                        'libcurl3': '7.43.0-1ubuntu2',
+                        'libzip4': '1.0.1-0ubuntu1',
+                        'libwxgtk3.0-0v5': '3.0.2+dfsg-1.2',
+                        'libsamplerate0': '0.1.8-8',
+                        'libicu55': '55.1-4ubuntu1'}
+
 deb_depends['7'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
                     'libboost-filesystem1.49.0': '1.49.0',
@@ -122,132 +143,134 @@ deb_depends['8'] = {'libc6': '2.19-18',
                     'libsamplerate0': '0.1.8-8',
                     'libicu52': '52.1-8+deb8u2'}
 
-deb_depends['unstable'] = {'libc6': '2.13',
-                    'libssh-4': '0.5.4',
-                    'libboost-filesystem1.55.0': '1.55.0',
-                    'libboost-thread1.55.0': '1.55.0',
-                    'libboost-regex1.55.0': '1.55.0',
-                    'libsndfile1': '1.0.25',
-                    'libmagick++5': '8:6.7.7.10',
-                    'libxml++2.6-2': '2.34.2',
-                    'libgtk2.0-0': '2.24.10',
-                    'libxmlsec1': '1.2.18',
-                    'libboost-date-time1.55.0': '1.55.0',
-                    'libxmlsec1-openssl': '1.2.18',
-                    'libcurl3': '7.26.0',
-                    'libzip2': '0.10.1',
-                    'libsamplerate0': '0.1.8-8',
-                    'libicu52': '52.1-9'}
+deb_depends['unstable'] = {'libc6': '2.19-22',
+                           'libssh-4': '0.6.3-4.1+b1',
+                           'libboost-filesystem1.58.0': '1.58.0+dfsg-4',
+                           'libboost-thread1.58.0': '1.58.0+dfsg-4',
+                           'libboost-regex1.58.0': '1.58.0+dfsg-4',
+                           'libsndfile1': '1.0.25-9.1',
+                           'libmagick++-6.q16-5v5': '8:6.8.9.9-6',
+                           'libxml++2.6-2v5': '2.40.1-1',
+                           'libgtk2.0-0': '2.24.28-1',
+                           'libxmlsec1': '1.2.20-2+b2',
+                           'libboost-date-time1.58.0': '1.58.0+dfsg-4',
+                           'libxmlsec1-openssl': '1.2.20-2+b2',
+                           'libcurl3': '7.45.0-1+b1',
+                           'libzip2': '0.11.2-1.2',
+                           'libsamplerate0': '0.1.8-8',
+                           'libicu52': '52.1-10'}
 
 def packages(name, packages, f):
     s = '%s: ' % name
     for p in packages:
         s += str(p) + ', '
-    print >>f,s[:-2]
+    print(s[:-2], file=f)
 
 def make_control(debian_version, bits, filename, debug):
     f = open(filename, 'w')
-    print >>f,'Source: dcpomatic'
-    print >>f,'Section: video'
-    print >>f,'Priority: extra'
-    print >>f,'Maintainer: Carl Hetherington <carl@dcpomatic.com>'
+    print('Source: dcpomatic', file=f)
+    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)
-    print >>f,'Standards-Version: 3.9.3'
-    print >>f,'Homepage: http://dcpomatic.com/'
-    print >>f,''
-    print >>f,'Package: dcpomatic'
+    print('Standards-Version: 3.9.3', file=f)
+    print('Homepage: http://dcpomatic.com/', file=f)
+    print('', file=f)
+    print('Package: dcpomatic', file=f)
     if bits == 32:
-        print >>f,'Architecture: i386'
+        print('Architecture: i386', file=f)
     else:
-        print >>f,'Architecture: amd64'
+        print('Architecture: amd64', file=f)
 
     packages('Depends', deb_depends[debian_version], f)
 
-    print >>f,'Description: Generator of Digital Cinema Packages (DCPs)'
-    print >>f,'  DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio'
-    print >>f,'  files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant'
-    print >>f,'  digital projectors.'
+    print('Description: Generator of Digital Cinema Packages (DCPs)', file=f)
+    print('  DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio', file=f)
+    print('  files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant', file=f)
+    print('  digital projectors.', file=f)
 
     if debug:
-        print >>f,''
-        print >>f,'Package: dcpomatic-dbg'
+        print('', file=f)
+        print('Package: dcpomatic-dbg', file=f)
         if bits == 32:
-            print >>f,'Architecture: i386'
+            print('Architecture: i386', file=f)
         else:
-            print >>f,'Architecture: amd64'
-        print >>f,'Section: debug'
-        print >>f,'Priority: extra'
+            print('Architecture: amd64', file=f)
+        print('Section: debug', file=f)
+        print('Priority: extra', file=f)
         packages('Depends', deb_depends[debian_version], f)
-        print >>f,'Description: debugging symbols for dcpomatic'
-        print >>f,'  This package contains the debugging symbols for dcpomatic.'
-        print >>f,''
+        print('Description: debugging symbols for dcpomatic', file=f)
+        print('  This package contains the debugging symbols for dcpomatic.', file=f)
+        print('', file=f)
 
 def make_spec(filename, version, target):
     """Make a .spec file for a RPM build"""
     f = open(filename, 'w')
-    print >>f,'Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files'
-    print >>f,'Name:dcpomatic2'
-    print >>f,'Version:%s' % version
-    print >>f,'Release:1%{?dist}'
-    print >>f,'License:GPL'
-    print >>f,'Group:Applications/Multimedia'
-    print >>f,'URL:http://dcpomatic.com/'
-    print >>f,'Requires: ImageMagick-c++, glibmm24, libzip'
-    print >>f,''
-    print >>f,'%description'
-    print >>f,'DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio '
-    print >>f,'files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant '
-    print >>f,'digital projectors.'
-    print >>f,''
-    print >>f,'%files'
-    print >>f,'%{_bindir}/dcpomatic2'
-    print >>f,'%{_bindir}/dcpomatic2_batch'
-    print >>f,'%{_bindir}/dcpomatic2_cli'
-    print >>f,'%{_bindir}/dcpomatic2_create'
-    print >>f,'%{_bindir}/dcpomatic2_kdm'
-    print >>f,'%{_bindir}/dcpomatic2_server'
-    print >>f,'%{_bindir}/dcpomatic2_server_cli'
-    print >>f,'%{_bindir}/dcpomatic2_kdm_cli'
-    print >>f,'%{_datadir}/applications/dcpomatic2.desktop'
-    print >>f,'%{_datadir}/applications/dcpomatic2_batch.desktop'
-    print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop'
-    print >>f,'%{_datadir}/applications/dcpomatic2_kdm.desktop'
-    print >>f,'%{_datadir}/dcpomatic2/dcpomatic2_server_small.png'
-    print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf'
-    print >>f,'%{_datadir}/dcpomatic2/splash.png'
+    print('Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files', file=f)
+    print('Name:dcpomatic2', file=f)
+    print('Version:%s' % version, file=f)
+    print('Release:1%{?dist}', file=f)
+    print('License:GPL', file=f)
+    print('Group:Applications/Multimedia', file=f)
+    print('URL:http://dcpomatic.com/', file=f)
+    print('Requires: ImageMagick-c++, glibmm24, libzip', file=f)
+    print('', file=f)
+    print('%description', file=f)
+    print('DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio ', file=f)
+    print('files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant ', file=f)
+    print('digital projectors.', file=f)
+    print('', file=f)
+    print('%files', file=f)
+    print('%{_bindir}/dcpomatic2', file=f)
+    print('%{_bindir}/dcpomatic2_batch', file=f)
+    print('%{_bindir}/dcpomatic2_cli', file=f)
+    print('%{_bindir}/dcpomatic2_create', file=f)
+    print('%{_bindir}/dcpomatic2_kdm', file=f)
+    print('%{_bindir}/dcpomatic2_server', file=f)
+    print('%{_bindir}/dcpomatic2_server_cli', file=f)
+    print('%{_bindir}/dcpomatic2_kdm_cli', file=f)
+    print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
+    print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', 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)
+    print('%{_datadir}/dcpomatic2/splash.png', file=f)
     for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']:
-        print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r
-        print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r
-        print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r
-        print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r
-    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT']:
-        print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l
-        print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l
-        print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l
-    print >>f,''
-    print >>f,'%prep'
-    print >>f,'rm -rf $RPM_BUILD_DIR/dcpomatic-%s' % version
-    print >>f,'tar xjf $RPM_SOURCE_DIR/dcpomatic-%s.tar.bz2' % version
-    print >>f,'%build'
-    print >>f,'cd dcpomatic-%s' % version
-    print >>f,'export PKG_CONFIG_PATH=%s/lib/pkgconfig:/usr/local/lib/pkgconfig' % target.directory
-    print >>f,'CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' % (target.directory, target.directory, configure_options(target))
-    print >>f,'./waf'
-    print >>f,'%install'
-    print >>f,'cd dcpomatic-%s' % version
-    print >>f,'./waf install'
-    print >>f,''
-    print >>f,'%post'
-    print >>f,'/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :'
-    print >>f,''
-    print >>f,'%postun'
-    print >>f,'if [ $1 -eq 0 ] ; then'
-    print >>f,'    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null'
-    print >>f,'    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :'
-    print >>f,'fi'
-    print >>f,''
-    print >>f,'%posttrans'
-    print >>f,'/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :'
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r, file=f)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.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', 'sk_SK', 'cs_CZ']:
+        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)
+    print('', file=f)
+    print('%prep', file=f)
+    print('rm -rf $RPM_BUILD_DIR/dcpomatic-%s' % version, file=f)
+    print('tar xjf $RPM_SOURCE_DIR/dcpomatic-%s.tar.bz2' % version, file=f)
+    print('%build', file=f)
+    print('cd dcpomatic-%s' % version, file=f)
+    print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig' % (target.directory, target.directory), file=f)
+    print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' % (target.directory, target.directory, configure_options(target)), file=f)
+    print('./waf', file=f)
+    print('%install', file=f)
+    print('cd dcpomatic-%s' % version, file=f)
+    print('./waf install', file=f)
+    print('', file=f)
+    print('%post', file=f)
+    print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
+    print('', file=f)
+    print('%postun', file=f)
+    print('if [ $1 -eq 0 ] ; then', file=f)
+    print('    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null', file=f)
+    print('    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
+    print('fi', file=f)
+    print('', file=f)
+    print('%posttrans', file=f)
+    print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
 
 def dependencies(target):
 
@@ -256,9 +279,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
-            ('libdcp', '914bd98'),
-            ('libsub', 'b9936eb'))
+    return (('ffmpeg-cdist', '96d67de', ffmpeg_options),
+            ('libdcp', '6db8817'),
+            ('libsub', '9fee7a4'))
 
 def configure_options(target):
     opt = ''
@@ -267,7 +290,7 @@ def configure_options(target):
     if target.platform == 'windows':
         opt += ' --target-windows'
     elif target.platform == 'linux':
-        opt += ' --static-dcpomatic --static-openjpeg --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
+        opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':
             opt += ' --static-xmlsec --static-ssh --disable-tests'
             if target.version == '6.5':
@@ -300,7 +323,7 @@ def package_debian(target, cpu, version):
     make_control(target.version, target.bits, 'debian/control', target.debug)
     target.command('./waf dist')
     f = open('debian/files', 'w')
-    print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu)
+    print('dcpomatic_%s-1_%s.deb video extra' % (version, cpu), file=f)
     shutil.rmtree('build/deb', ignore_errors=True)
 
     os.makedirs('build/deb')
@@ -316,7 +339,7 @@ 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 == '15.04' or target.version == '8':
+    if target.version in ['15.04', '15.10', '8']:
         target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
     else:
         target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')
@@ -352,9 +375,9 @@ def package_rpm(target, cpu, version):
     else:
         cpu = "i686"
 
-    print 'Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu)
+    print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu))
     for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
-        print 'found %s' % p
+        print('found %s' % p)
         rpms.append(os.path.abspath(p))
 
     return rpms
@@ -364,11 +387,11 @@ def package(target, version):
         return package_windows(target)
     elif target.platform == 'linux':
         if target.bits == 32:
-           cpu = 'i386'
+            cpu = 'i386'
         else:
-            cpu        = 'amd64'
+            cpu = 'amd64'
 
-       if target.distro == 'debian' or target.distro == 'ubuntu':
+        if target.distro == 'debian' or target.distro == 'ubuntu':
             return package_debian(target, cpu, version)
         elif target.distro == 'centos' or target.distro == 'fedora':
             return package_rpm(target, cpu, version)
@@ -380,7 +403,7 @@ def make_pot(target):
     target.command('./waf pot')
     return [os.path.abspath('build/src/lib/libdcpomatic.pot'),
             os.path.abspath('build/src/wx/libdcpomatic-wx.pot'),
-           os.path.abspath('build/src/tools/dcpomatic.pot')]
+            os.path.abspath('build/src/tools/dcpomatic.pot')]
 
 def make_manual(target):
     os.chdir('doc/manual')