X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=20f360e922c6c20fcefb01e72f8b6263ce13e06b;hb=refs%2Fheads%2Fmaster-rtaudio;hp=e11b8e3699dcecbdbae40131acabc2896422acb6;hpb=4f85ccdd794682ed04081755d9272d6f006b4c2f;p=dcpomatic.git diff --git a/cscript b/cscript index e11b8e369..20f360e92 100644 --- a/cscript +++ b/cscript @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2012-2019 Carl Hetherington +# Copyright (C) 2012-2020 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -33,14 +33,10 @@ deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['16.04'].extend(['libssh-dev']) deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['18.04'].extend(['libssh-dev']) -deb_build_depends['19.04'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['19.04'].extend(['libssh-dev']) -deb_build_depends['19.10'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['19.10'].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-gcrypt-dev']) +deb_build_depends['20.04'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['20.04'].extend(['libssh-dev']) +deb_build_depends['20.10'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['20.10'].extend(['libssh-dev']) deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['9'].extend(['libssh-gcrypt-dev']) deb_build_depends['10'] = copy.deepcopy(deb_build_depends_base) @@ -85,57 +81,42 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1', 'libcurl4', 'libpulse0']) -deb_depends['19.04'] = copy.deepcopy(deb_depends_base) -deb_depends['19.04'].extend(['libboost-filesystem1.67.0', - 'libboost-thread1.67.0', - 'libboost-regex1.67.0', - 'libboost-date-time1.67.0', +deb_depends['20.04'] = copy.deepcopy(deb_depends_base) +deb_depends['20.04'].extend(['libboost-filesystem1.71.0', + 'libboost-thread1.71.0', + 'libboost-regex1.71.0', + 'libboost-date-time1.71.0', 'libcairomm-1.0-1v5', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip5', - 'libwxgtk3.0-0v5', - 'libicu63', - 'libnettle6', + 'libwxgtk3.0-gtk3-0v5', + 'libicu66', + 'libnettle7', 'libssh-4', 'libx264-155', 'libcurl4', - 'libpulse0']) - -deb_depends['19.10'] = copy.deepcopy(deb_depends_base) -deb_depends['19.10'].extend(['libboost-filesystem1.67.0', - 'libboost-thread1.67.0', - 'libboost-regex1.67.0', - 'libboost-date-time1.67.0', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5']) + +deb_depends['20.10'] = copy.deepcopy(deb_depends_base) +deb_depends['20.10'].extend(['libboost-filesystem1.71.0', + 'libboost-thread1.71.0', + 'libboost-regex1.71.0', + 'libboost-date-time1.71.0', 'libcairomm-1.0-1v5', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip5', - 'libwxgtk3.0-0v5', - 'libicu63', - 'libnettle6', + 'libicu67', + 'libnettle8', 'libssh-4', - 'libx264-155', + 'libx264-160', 'libcurl4', - 'libpulse0']) - -deb_depends['8'] = copy.deepcopy(deb_depends_base) -deb_depends['8'].extend(['libboost-filesystem1.55.0', - 'libboost-thread1.55.0', - 'libboost-date-time1.55.0', - 'libboost-regex1.55.0', - 'libxml++2.6-2', - 'libzip2', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1', - 'libwxgtk3.0-0', - 'libxcb-xfixes0', - 'libxcb-shape0', - 'libicu52', - 'libnettle4', - 'libssh-4', - 'libx264-142', - 'libcurl3']) + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -344,9 +325,9 @@ def dependencies(target): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.6.14')) - deps.append(('libsub', 'v1.4.17')) - deps.append(('rtaudio-cdist', 'bf0fc23')) + deps.append(('libdcp', 'v1.6.16')) + deps.append(('libsub', 'v1.4.23')) + deps.append(('rtaudio-cdist', 'f9e5a84')) return deps @@ -415,18 +396,18 @@ def build(target, options): 'sources': [{'type': 'archive', 'url': '%s/pangomm-2.40.1.tar.xz' % prefix, 'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]}) - modules.append({'name': 'libxml++', + modules.append({'name': 'libxml++', 'sources': [{'type': 'archive', 'url': '%s/libxml++-2.40.1.tar.xz' % prefix, 'sha256': '4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9'}]}) modules.append({'name': 'xmlsec1', 'sources': [{'type': 'archive', 'url': '%s/xmlsec1-1.2.25.tar.gz' % prefix, - 'sha256': '967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2'}]}) - modules.append({'name': 'openjpeg2', + 'sha256': '967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2'}]}) + modules.append({'name': 'openjpeg2', 'buildsystem': 'cmake', 'sources': [{'type': 'dir', 'path': os.path.abspath('../openjpeg2-cdist')}]}) - modules.append({'name': 'boost', + modules.append({'name': 'boost', 'buildsystem': 'simple', 'build-commands': [ './bootstrap.sh --prefix=/app', @@ -435,37 +416,37 @@ def build(target, options): 'sources': [{'type': 'archive', 'url': '%s/boost_1_66_0.tar.bz2' % prefix, 'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]}) - modules.append({'name': 'asdcplib', + modules.append({'name': 'asdcplib', 'buildsystem': 'simple', 'build-commands': [ './waf configure --prefix=/app --libdir=/app/lib build install' ], 'sources': [{'type': 'dir', 'path': os.path.abspath('../asdcplib-cth')}]}) - modules.append({'name': 'locked_sstream', + modules.append({'name': 'locked_sstream', 'buildsystem': 'simple', 'build-commands': [ './waf configure --prefix=/app build install' ], 'sources': [{'type': 'dir', 'path': os.path.abspath('../locked_sstream')}]}) - modules.append({'name': 'libcxml', + modules.append({'name': 'libcxml', 'buildsystem': 'simple', 'build-commands': [ './waf configure --prefix=/app --libdir=/app/lib build install' ], 'sources': [{'type': 'dir', 'path': os.path.abspath('../libcxml')}]}) - modules.append({'name': 'libdcp', + modules.append({'name': 'libdcp', 'buildsystem': 'simple', 'build-commands': [ './waf configure --prefix=/app --libdir=/app/lib build install' ], 'sources': [{'type': 'dir', 'path': os.path.abspath('../libdcp')}]}) - modules.append({'name': 'libsub', + modules.append({'name': 'libsub', 'buildsystem': 'simple', 'build-commands': [ './waf configure --prefix=/app --libdir=/app/lib build install' ], 'sources': [{'type': 'dir', 'path': os.path.abspath('../libsub')}]}) - modules.append({'name': 'rtaudio', + modules.append({'name': 'rtaudio', 'build-options': { 'config-opts': [ '--prefix=/app', @@ -474,17 +455,17 @@ def build(target, options): ] }, 'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]}) - modules.append({'name': 'wxwidgets', + modules.append({'name': 'wxwidgets', 'sources': [{'type': 'archive', 'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix, 'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]}) - modules.append({'name': 'libssh', + modules.append({'name': 'libssh', 'buildsystem': 'cmake', 'builddir': True, 'sources': [{'type': 'archive', 'url': '%s/libssh-0.7.5.tar.xz' % prefix, 'sha256': '54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'}]}) - modules.append({'name': 'dcpomatic', + modules.append({'name': 'dcpomatic', 'buildsystem': 'simple', 'build-commands': [ './waf configure --prefix=/app build install' @@ -640,8 +621,11 @@ def package(target, version, options): return package_debian(target, cpu, version, options) elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia': return package_rpm(target, cpu, version, options) - elif target.platform == 'osx': - target.command('bash platform/osx/make_dmg.sh %s %s' % (target.environment_prefix, target.directory)) + elif target.platform == 'osx' and target.bits is None: + target.command('bash platform/osx/make_dmg.sh %s %s universal %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) + return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')] + elif target.platform == 'osx' and target.bits == 64: + target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) 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')