X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=56c9b048018e34b09d2104624626f59d21754cea;hb=aaf1d809a0ebbc2eb7dcd9ea7146cfe7bb4702f1;hp=247404ea262b0d13d25a8ea41c9828272af76cb1;hpb=5bcb8526fa49b5b180c0239ae47045818469c54c;p=dcpomatic.git diff --git a/cscript b/cscript index 247404ea2..56c9b0480 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,6 +36,8 @@ 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) @@ -46,18 +48,6 @@ 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', @@ -67,10 +57,11 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0', 'libboost-date-time1.54.0', 'libzip2', 'libcairomm-1.0-1', - 'libpangomm-1.4-1', + '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', @@ -80,10 +71,13 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libxml++2.6-2v5', 'libboost-date-time1.58.0', 'libzip4', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', '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', @@ -96,7 +90,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', @@ -110,7 +119,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', @@ -120,12 +130,15 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0', 'libmagick++-6.q16-5', 'libxml++2.6-2', 'libzip2', + 'libcairomm-1.0-1', + 'libpangomm-1.4-1', 'libwxgtk3.0-0', 'libxcb-xfixes0', 'libxcb-shape0', 'libicu52', 'libnettle4', - 'libssh-4']) + 'libssh-4', + 'libx264-142']) deb_depends['unstable'] = copy.deepcopy(deb_depends_base) deb_depends['unstable'].extend(['libboost-filesystem1.58.0', @@ -137,7 +150,8 @@ deb_depends['unstable'].extend(['libboost-filesystem1.58.0', 'libboost-date-time1.58.0', 'libzip2', 'libicu52', - 'libnettle6']) + 'libnettle6', + 'libx264-148']) def packages(name, packages, f): s = '%s: ' % name @@ -265,9 +279,10 @@ def dependencies(target): else: ffmpeg_options = {} - return (('ffmpeg-cdist', 'c7df8d5', ffmpeg_options), - ('libdcp', '028a6d7'), - ('libsub', 'v1.2.4')) + return (('ffmpeg-cdist', 'd993f38', ffmpeg_options), + ('libdcp', '14fe126'), + ('libsub', '1551cad'), + ('rtaudio-cdist', None)) def configure_options(target): opt = '' @@ -333,7 +348,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 in ['15.04', '15.10', '16.04', '16.10', '8', 'unstable']: + if target.version in ['15.04', '15.10', '16.04', '16.10', '17.04', '8', 'unstable']: target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') else: target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale') @@ -398,6 +413,21 @@ def package(target, version): elif target.platform == 'osx': target.command('bash platform/osx/make_dmg.sh %s' % target.directory) return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')] + elif target.platform == 'docker': + shutil.copyfile(target.deb, 'build/platform/docker') + f = open('build/platform/docker/Dockerfile', 'w') + print('FROM debian:jessie', file=f) + print('MAINTAINER carl@dcpomatic.com', file=f) + print('ADD build/platform/docker/dcpomatic_%s-1_amd64.deb /tmp' % (version, version), file=f) + print('RUN apt-get -o Acquire:http::Timeout="5" update; exit 0', file=f) + print('RUN dpkg -i /tmp/dcpomatic_*.deb; exit 0', file=f) + print('RUN apt-get -y -f install', file=f) + print('RUN apt-get clean', file=f) + print('EXPOSE 6192', file=f) + print('CMD ["/usr/bin/dcpomatic2_server_cli", "--verbose"]', file=f) + f.close() + target.command('docker build build/platform/docker -t dcpomatic-server:%s' % version) + target.command('docker save dcpomatic-server:%s -o dcpomatic-server-%s-docker.tar' % (version, version)) def make_pot(target): target.command('./waf pot')