X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=09ced5bfc3dbd8d4c39674cdbb24a508b17f59e0;hb=b2eb7f6dec6d65155dd3c587982af6bd6312e488;hp=a41e788efd3bc01251c055304823313d48d3449d;hpb=aef9cf2884f38473631a7f4d84bca84b6ec81d8b;p=dcpomatic.git diff --git a/cscript b/cscript index a41e788ef..09ced5bfc 100644 --- a/cscript +++ b/cscript @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2012-2016 Carl Hetherington +# Copyright (C) 2012-2017 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -26,7 +26,7 @@ import copy deb_build_depends = dict() -deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev'] +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']) @@ -36,28 +36,20 @@ 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-dev']) +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', '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', - 'libssh-4']) - deb_depends['14.04'] = copy.deepcopy(deb_depends_base) deb_depends['14.04'].extend(['libboost-filesystem1.54.0', 'libboost-thread1.54.0', @@ -70,7 +62,8 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0', 'libpangomm-1.4-1,' 'libicu52', 'libnettle4', - 'libssh-4']) + 'libssh-4', + 'libx264-142']) deb_depends['16.04'] = copy.deepcopy(deb_depends_base) deb_depends['16.04'].extend(['libboost-filesystem1.58.0', @@ -85,7 +78,8 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libwxgtk3.0-0v5', 'libicu55', 'libnettle6', - 'libssh-4']) + 'libssh-4', + 'libx264-148']) deb_depends['16.10'] = copy.deepcopy(deb_depends_base) deb_depends['16.10'].extend(['libboost-filesystem1.61.0', @@ -98,7 +92,22 @@ deb_depends['16.10'].extend(['libboost-filesystem1.61.0', 'libwxgtk3.0-0v5', 'libicu57', 'libnettle6', - 'libssh-4']) + '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', @@ -112,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', @@ -129,19 +139,34 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0', 'libxcb-shape0', 'libicu52', 'libnettle4', - 'libssh-4']) + '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 @@ -269,9 +294,9 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', 'c7df8d5', ffmpeg_options), - ('libdcp', 'a3032f3'), - ('libsub', 'a04f1d5'), + return (('ffmpeg-cdist', 'd993f38', ffmpeg_options), + ('libdcp', 'a6a4c47'), + ('libsub', 'a25cc3f'), ('rtaudio-cdist', None)) def configure_options(target): @@ -338,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', '16.10', '8', 'unstable']: - 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')