Merge master.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index bcbd7bfe71811b42482fb52850f75c12a0d2afb3..2ac5fea9128a267aa7b6c2d22bc8e58eaec1cf25 100644 (file)
--- a/cscript
+++ b/cscript
@@ -7,8 +7,6 @@ deb_build_depends = {'debhelper': '8.0.0',
                      'g++': '4:4.6.3',
                      'pkg-config': '0.26',
                      'libssh-dev': '0.5.2',
-                     'libboost-filesystem-dev': '1.46.0',
-                     'libboost-thread-dev': '1.46.0',
                      'libsndfile1-dev': '1.0.25',
                      'libmagick++-dev': '8:6.6.9.7',
                      'libgtk2.0-dev': '2.24.10'}
@@ -17,15 +15,15 @@ deb_depends = dict()
 
 deb_depends['12.04'] = {'libc6': '2.15',
                         'libssh-4': '0.5.2',
-                        'libboost-filesystem1.46.1': '1.46.1',
-                        'libboost-thread1.46.1': '1.46.1',
+                        'libboost-filesystem1.48.0': '1.48.0-3',
+                        'libboost-thread1.48.0': '1.48.0-3',
                         'libsndfile1': '1.0.25',
                         'libmagick++4': '8:6.6.9.7',
                         'libxml++2.6-2': '2.34.1',
                         'libgtk2.0-0': '2.24.10',
                         'libxmlsec1': '1.2.14-1.2build1',
                         'libxmlsec1-openssl': '1.2.14-1.2build1',
-                        'libboost-date-time1.46.1': '1.46.1',
+                        'libboost-date-time1.48.0': '1.48.0-3',
                         'libcurl3': '7.22.0-3ubuntu4',
                         'libzip2': '0.10-1ubuntu1'}
 
@@ -99,6 +97,21 @@ deb_depends['7'] = {'libc6': '2.13',
                     'libcurl3': '7.26.0',
                     'libzip2': '0.10.1'}
 
+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',
+                    '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'}
+
+
 def packages(name, packages, f):
     s = '%s: ' % name
     for p in packages:
@@ -143,8 +156,8 @@ def make_control(debian_version, bits, filename, debug):
         print >>f,''
 
 def dependencies(target):
-    return (('ffmpeg-cdist', 'bba68a5'),
-            ('libdcp', 'c01716c'))
+    return (('ffmpeg-cdist', '67dc770'),
+            ('libdcp', '1.0'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -153,8 +166,13 @@ def build(target, options):
     elif target.platform == 'linux':
         if target.distro == 'debian' or target.distro == 'ubuntu':
             cmd += ' --target-debian'
+            if target.version == 'unstable':
+                cmd += ' --debian-unstable'
         elif target.distro == 'centos':
-            cmd += ' --target-centos'
+            if target.version == '6.5':
+                cmd += ' --target-centos-6 --disable-tests'
+            elif target.version == '7':
+                cmd += ' --target-centos-7'
 
     target.command(cmd)
     target.command('./waf')
@@ -188,6 +206,8 @@ def package_debian(target, cpu, version):
     target.set('CDIST_LINKFLAGS', target.get('LINKFLAGS'))
     target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS'))
     target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH'))
+    if target.version == 'unstable':
+        target.set('CDIST_EXTRA_CONFIGURE', '--debian-unstable')
     target.command('dpkg-buildpackage')
     
     debs = []