Fix deps to up-to-date versions; remove 15.04 ubuntu deps.

diff --git a/cscript b/cscript
index e97cf8744243fc3837f905fd4810c069664e7425..1199c69caa7a77304eebaa3973006e9177053eb6 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -68,24 +68,6 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libpangomm-1.4-1': '2.34.0-1ubuntu1',
                         'libicu52': '52.1-3'}
 
-deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
-                        'libssh-4': '0.6.3-3ubuntu3',
-                        'libboost-filesystem1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libboost-thread1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libboost-regex1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libsndfile1': '1.0.25-9.1',
-                        'libmagick++-6.q16-5': '8:6.8.9.9-5',
-                        'libxml++2.6-2': '2.36.0-2.1',
-                        'libgtk2.0-0': '2.24.27-0ubuntu1',
-                        'libxmlsec1': '1.2.20-2ubuntu2',
-                        'libxmlsec1-openssl': '1.2.20-2ubuntu2',
-                        'libboost-date-time1.55.0': '1.55.0+dfsg-3ubuntu2',
-                        'libcurl3': '7.38.0-3ubuntu2',
-                        'libzip2': '0.11.2-1.2',
-                        'libwxgtk3.0-0': '3.0.2-1',
-                        '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',
@@ -280,8 +262,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '96d67de', ffmpeg_options),
-            ('libdcp', '45841f3'),
-            ('libsub', 'e3a5761'))
+            ('libdcp', 'v1.3.0'),
+            ('libsub', 'v1.1.0'))
 
 def configure_options(target):
     opt = ''

diff --git a/wscript b/wscript
index 290db03ff5f045f4858dc1f42cec637a0b2c1abd..7df53e51be9f04a5322c333ba6ffcd34e94aa897 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -212,10 +212,10 @@ def configure(conf):
 
     # libcxml
     if conf.options.static_cxml:
-        conf.check_cfg(package='libcxml', atleast_version='0.12.0', args='--cflags', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags', uselib_store='CXML', mandatory=True)
         conf.env.STLIB_CXML = ['cxml']
     else:
-        conf.check_cfg(package='libcxml', atleast_version='0.12.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags --libs', uselib_store='CXML', mandatory=True)
 
     # libssh
     if conf.options.static_ssh:
@@ -237,21 +237,21 @@ def configure(conf):
 
     # libdcp
     if conf.options.static_dcp:
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.0', args='--cflags', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
         conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
     else:
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
 
     # libsub
     if conf.options.static_sub:
-        conf.check_cfg(package='libsub-1.0', atleast_version='1.1.8', args='--cflags', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.1.10', args='--cflags', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
         conf.env.STLIB_SUB = ['sub-1.0']
     else:
-        conf.check_cfg(package='libsub-1.0', atleast_version='1.1.8', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.1.10', args='--cflags --libs', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
 
     # libxml++