X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=f3757fa4ad750f2fa0740bb1bd7040ac04c818a3;hb=f0edd6ab35c3c2b7800a26ec8206adab75e5f633;hp=ef9294f9a83d9a248dbd4de20e7e9445261a3be2;hpb=8aeb741ccbe2edb528e98a431bf55459a6836a9b;p=dcpomatic.git diff --git a/cscript b/cscript index ef9294f9a..f3757fa4a 100644 --- 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'} @@ -71,6 +69,20 @@ deb_depends['13.10'] = {'libc6': '2.17-93', 'libcurl3': '7.29.0-1ubuntu3', 'libzip2': '0.10.1-1.1'} +deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6', + 'libssh-4': '0.6.1-0ubuntu3', + 'libboost-filesystem1.54.0': '1.54.0-4ubuntu3', + 'libboost-thread1.54.0': '1.54.0-4ubuntu3', + 'libsndfile1': '1.0.25-7ubuntu2', + 'libmagick++5': '8:6.7.7.10-6ubuntu3', + 'libxml++2.6-2': '2.36.0-2ubuntu1', + 'libgtk2.0-0': '2.24.23-0ubuntu1', + 'libxmlsec1': '1.2.18-2ubuntu1', + 'libxmlsec1-openssl': '1.2.18-2ubuntu1', + 'libboost-date-time1.54.0': '1.54.0-4ubuntu3', + 'libcurl3': '7.35.0-1ubuntu2', + 'libzip2': '0.10.1-1.2'} + deb_depends['7'] = {'libc6': '2.13', 'libssh-4': '0.5.4', 'libboost-filesystem1.49.0': '1.49.0', @@ -129,8 +141,8 @@ def make_control(debian_version, bits, filename, debug): print >>f,'' def dependencies(target): - return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'), - ('libdcp', 'f74c462')) + return (('ffmpeg-cdist', '67dc770'), + ('libdcp', '1.0')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript()