X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=d1bc02c05d1d6accad2a98648c97626a74a31273;hp=f32df19fd2e9a6cd184673adab88727e5458f63e;hb=e81c5eb9e8ff875240dde9fdaaab0a46f99af615;hpb=1d9bbf7bb0b52d5461719d2d3fe5ea178565e35d diff --git a/cscript b/cscript index f32df19fd..d1bc02c05 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. # @@ -29,20 +29,18 @@ deb_build_depends = dict() deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev'] -deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['14.04'].extend(['libssh-dev']) 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['18.10'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['18.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['19.10'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['19.10'].extend(['libssh-dev']) +deb_build_depends['20.04'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['20.04'].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) +deb_build_depends['10'].extend(['libssh-gcrypt-dev']) deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base) deb_depends = dict() @@ -50,21 +48,6 @@ deb_depends_gui = dict() deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libgtk2.0-0'] -deb_depends['14.04'] = copy.deepcopy(deb_depends_base) -deb_depends['14.04'].extend(['libboost-filesystem1.54.0', - 'libboost-thread1.54.0', - 'libboost-regex1.54.0', - 'libxml++2.6-2', - 'libboost-date-time1.54.0', - 'libzip2', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1,' - 'libicu52', - 'libnettle4', - 'libssh-4', - 'libx264-142', - 'libcurl3']) - deb_depends['16.04'] = copy.deepcopy(deb_depends_base) deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libboost-thread1.58.0', @@ -79,7 +62,8 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libnettle6', 'libssh-4', 'libx264-148', - 'libcurl3']) + 'libcurl3', + 'libxerces-c3.1']) deb_depends['18.04'] = copy.deepcopy(deb_depends_base) deb_depends['18.04'].extend(['libboost-filesystem1.65.1', @@ -96,57 +80,47 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1', 'libssh-4', 'libx264-152', 'libcurl4', - 'libpulse0']) - -deb_depends['18.10'] = copy.deepcopy(deb_depends_base) -deb_depends['18.10'].extend(['libboost-filesystem1.65.1', - 'libboost-thread1.65.1', - 'libboost-regex1.65.1', - 'libboost-date-time1.65.1', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg4']) + +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', 'libcairomm-1.0-1v5', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', - 'libzip4', + 'libzip5', 'libwxgtk3.0-0v5', - 'libicu60', + 'libicu63', 'libnettle6', 'libssh-4', - 'libx264-152', + 'libx264-155', 'libcurl4', - 'libpulse0']) - -deb_depends['7'] = copy.deepcopy(deb_depends_base) -deb_depends['7'].extend(['libboost-filesystem1.49.0', - 'libboost-thread1.49.0', - 'libboost-regex1.49.0', - 'libxml++2.6-2', - 'libboost-date-time1.49.0', - 'libzip2', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1', - 'libicu48', - 'libnettle4', - 'libnotify4', - 'libx264-123', - 'libcurl3']) - -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['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-gtk3-0v5', + 'libicu66', + 'libnettle7', + 'libssh-4', + 'libx264-155', + 'libcurl4', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -163,7 +137,8 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libssh-gcrypt-4', 'libnettle6', 'libx264-148', - 'libcurl3']) + 'libcurl3', + 'libxerces-c3.1']) deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5', 'libxcb-xfixes0', @@ -171,18 +146,68 @@ deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5', 'libasound2', 'libpulse0' ] +deb_depends['10'] = copy.deepcopy(deb_depends_base) +deb_depends['10'].extend(['libboost-filesystem1.67.0', + 'libboost-thread1.67.0', + 'libboost-regex1.67.0', + 'libboost-date-time1.67.0', + 'libxml++2.6-2v5', + 'libgtk2.0-0', + 'libzip4', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libicu63', + 'libssh-4', + 'libssh-gcrypt-4', + 'libnettle6', + 'libx264-155', + 'libcurl4', + 'libxerces-c3.2', + 'libnanomsg5']) + +deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5', + 'libxcb-xfixes0', + 'libxcb-shape0', + 'libasound2', + 'libpulse0' ] + deb_depends['unstable'] = copy.deepcopy(deb_depends_base) -deb_depends['unstable'].extend(['libboost-filesystem1.62.0', - 'libboost-thread1.62.0', - 'libboost-regex1.62.0', - 'libboost-date-time1.62.0', +deb_depends['unstable'].extend(['libboost-filesystem1.67.0', + 'libboost-thread1.67.0', + 'libboost-regex1.67.0', + 'libboost-date-time1.67.0', 'libxml++2.6-2v5', 'libgtk2.0-0', 'libzip4', - 'libicu57', + 'libicu63', 'libnettle6', - 'libx264-148', - 'libcurl3']) + 'libx264-155', + 'libcurl4', + 'libxerces-c3.2']) + +def can_build_disk(target): + # We can build dcpomatic2_disk on platforms that have Boost process and can build the lwext4 + # library. For now, just whitelist good ones here. + # + # - Lots of Linux distros (including Ubuntu 16.04) don't have a new enough boost (1.64 or above) + # - On Centos 6 we can't build lwext4 because it needs a new CMake which Centos 6's g++ is not new enough to build. + # - On Centos 7 there is a build error in lwext4 related to __unused + if target.platform == 'windows': + return True + if target.platform == 'osx': + return True + if target.platform == 'linux': + if target.distro == 'ubuntu' and target.version in ['18.04', '19.10', '20.04']: + return True + if target.distro == 'debian' and target.version == '10': + return True + if target.detail == 'appimage': + return True + if target.distro == 'fedora' and target.version == '31': + return True + if target.distro == 'centos' and target.version == '8': + return True + return False def packages(name, packages, f): s = '%s: ' % name @@ -233,6 +258,7 @@ def make_control(debian_version, bits, filename, debug, gui): def make_spec(filename, version, target, options, requires=None): """Make a .spec file for a RPM build""" + tools = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(filename))), "src/tools") f = open(filename, 'w') print('Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files', file=f) print('Name:dcpomatic2', file=f) @@ -259,12 +285,22 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_kdm_cli', file=f) print('%{_bindir}/dcpomatic2_player', file=f) print('%{_bindir}/dcpomatic2_playlist', file=f) + print('%{_bindir}/dcpomatic2_openssl', file=f) + if options['variant'] == 'swaroop-studio': + print('%{_bindir}/dcpomatic2_ecinema', file=f) + print('%{_bindir}/dcpomatic2_uuid', file=f) + if os.path.exists(os.path.join(tools, "dcpomatic2_disk")): + print('%{_bindir}/dcpomatic2_disk', file=f) + print('%{_bindir}/dcpomatic2_disk_writer', file=f) print('%{_datadir}/applications/dcpomatic2.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f) + print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f) + if os.path.exists(os.path.join(tools, "dcpomatic2_disk")): + print('%{_datadir}/applications/dcpomatic2_disk.desktop', file=f) print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f) print('%{_datadir}/dcpomatic2/select.png', file=f) print('%{_datadir}/dcpomatic2/sequence.png', file=f) @@ -273,6 +309,7 @@ def make_spec(filename, version, target, options, requires=None): print('%{_datadir}/dcpomatic2/zoom_all.png', file=f) print('%{_datadir}/dcpomatic2/tick.png', file=f) print('%{_datadir}/dcpomatic2/no_tick.png', file=f) + print('%{_datadir}/dcpomatic2/me.jpg', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f) @@ -284,8 +321,9 @@ def make_spec(filename, version, target, options, requires=None): print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.png' % r, file=f) + print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.png' % r, file=f) for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', - 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR']: + 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'ko_KR']: print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f) @@ -296,13 +334,13 @@ def make_spec(filename, version, target, options, requires=None): print('%build', file=f) print('cd dcpomatic-%s' % version, file=f) print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig' % (target.directory, target.directory), file=f) - print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' % (target.directory, target.directory, configure_options(target, options)), file=f) print('./waf', file=f) print('%install', file=f) print('cd dcpomatic-%s' % version, file=f) print('./waf install', file=f) + print('/bin/cp %s/src/openssl/apps/openssl %%{buildroot}/usr/bin/dcpomatic2_openssl' % target.directory, file=f) print('', file=f) print('%post', file=f) print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f) @@ -316,7 +354,7 @@ def make_spec(filename, version, target, options, requires=None): print('%posttrans', file=f) print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f) -def dependencies(target): +def dependencies(target, options): if target.platform == 'linux': ffmpeg_options = { 'shared': False } @@ -326,19 +364,31 @@ def dependencies(target): if target.platform == 'windows' and target.version == 'xp': deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)] elif target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg-cdist', 'a820b44', ffmpeg_options)] + deps = [('ffmpeg-cdist', '20d3ddf', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.6.5')) - deps.append(('libsub', 'v1.4.5')) - deps.append(('rtaudio-cdist', 'aad62d7')) + # Let's use C++11 mode if we can + cpp_lib_options = {'force-cpp11': True} if ( + (target.platform == 'osx' and target.bits == 64) or + (target.platform == 'windows')) else {} + + deps.append(('libdcp', None, cpp_lib_options)) + deps.append(('libsub', None, cpp_lib_options)) + deps.append(('leqm-nrt', 'carl')) + deps.append(('rtaudio', 'carl')) + # We get our OpenSSL libraries from the environment, but we + # also need a patched openssl binary to make certificates. + # This dependency is to get that binary, which is added into + # the appropriate place later + deps.append(('openssl', 'carl')) + if can_build_disk(target): + deps.append(('lwext4', '370b3de6')) return deps -def option_defaults(): - return { "gui": True, "variant": None } +option_defaults = { "gui": True, "variant": None } def configure_options(target, options): opt = '' @@ -363,6 +413,8 @@ def configure_options(target, options): # I worry that this will cause ABI problems but I don't have # a better solution. opt += ' --force-cpp11' + elif target.platform == 'osx' and target.bits == 64: + opt += ' --force-cpp11' if not options['gui']: opt += ' --disable-gui' @@ -374,6 +426,9 @@ def configure_options(target, options): if target.debug and target.platform == 'windows': opt += ' --static-dcpomatic' + if can_build_disk(target): + opt += ' --enable-disk' + return opt def build(target, options): @@ -385,7 +440,7 @@ def build(target, options): 'buildsystem': 'cmake', 'sources': [{'type': 'archive', 'url': '%s/libzip-1.4.0.tar.xz' % prefix, - 'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]}) + 'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]}) modules.append({'name': 'libsigc++', 'sources': [{'type': 'archive', 'url': '%s/libsigc++-2.10.0.tar.xz' % prefix, @@ -399,87 +454,87 @@ def build(target, options): 'url': '%s/cairomm-1.12.2.tar.gz' % prefix, 'sha256': '45c47fd4d0aa77464a75cdca011143fea3ef795c4753f6e860057da5fb8bd599'}]}) modules.append({'name': 'pangomm', - 'sources': [{'type': 'archive', - 'url': '%s/pangomm-2.40.1.tar.xz' % prefix, - 'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]}) - modules.append({'name': 'libxml++', - 'sources': [{'type': 'archive', - 'url': '%s/libxml++-2.40.1.tar.xz' % prefix, - 'sha256': '4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9'}]}) + 'sources': [{'type': 'archive', + 'url': '%s/pangomm-2.40.1.tar.xz' % prefix, + 'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]}) + 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', - 'buildsystem': 'cmake', - 'sources': [{'type': 'dir', 'path': os.path.abspath('../openjpeg2-cdist')}]}) - modules.append({'name': 'boost', - 'buildsystem': 'simple', - 'build-commands': [ - './bootstrap.sh --prefix=/app', - './b2 install' - ], - 'sources': [{'type': 'archive', - 'url': '%s/boost_1_66_0.tar.bz2' % prefix, - 'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]}) - 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', - 'buildsystem': 'simple', - 'build-commands': [ - './waf configure --prefix=/app build install' - ], - 'sources': [{'type': 'dir', 'path': os.path.abspath('../locked_sstream')}]}) - 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', - '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', - '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', - 'build-options': { - 'config-opts': [ - '--prefix=/app', - '--with-pulse', - '--with-alsa' - ] - }, - 'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]}) - modules.append({'name': 'wxwidgets', - 'sources': [{'type': 'archive', - 'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix, - 'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]}) - 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', - 'buildsystem': 'simple', - 'build-commands': [ - './waf configure --prefix=/app build install' - ], + 'sources': [{'type': 'archive', + 'url': '%s/xmlsec1-1.2.25.tar.gz' % prefix, + 'sha256': '967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2'}]}) + modules.append({'name': 'openjpeg2', + 'buildsystem': 'cmake', + 'sources': [{'type': 'dir', 'path': os.path.abspath('../openjpeg2-cdist')}]}) + modules.append({'name': 'boost', + 'buildsystem': 'simple', + 'build-commands': [ + './bootstrap.sh --prefix=/app', + './b2 install' + ], + 'sources': [{'type': 'archive', + 'url': '%s/boost_1_66_0.tar.bz2' % prefix, + 'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]}) + 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-carl')}]}) + 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', + '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', + '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', + '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', 'build-options': { - 'build-args': ['--share=network'] + 'config-opts': [ + '--prefix=/app', + '--with-pulse', + '--with-alsa' + ] }, - 'sources': [{'type': 'dir', 'path': os.path.abspath('.')}]}) + 'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]}) + modules.append({'name': 'wxwidgets', + 'sources': [{'type': 'archive', + 'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix, + 'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]}) + 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', + 'buildsystem': 'simple', + 'build-commands': [ + './waf configure --prefix=/app build install' + ], + 'build-options': { + 'build-args': ['--share=network'] + }, + 'sources': [{'type': 'dir', 'path': os.path.abspath('.')}]}) desc = {'app-id': 'com.dcpomatic.DCP-o-matic', 'runtime': 'org.gnome.Sdk', 'runtime-version': '3.26', @@ -508,7 +563,7 @@ def package_windows(target): target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier)) target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, identifier)) target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, identifier)) - target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, identifier)) + target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.environment_prefix, identifier)) target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier)) target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % identifier) target.command('makensis build/platform/windows/installer2.%s.nsi' % identifier) @@ -530,14 +585,11 @@ def package_debian(target, cpu, version, options): target.set('CDIST_LINKFLAGS', target.get('LINKFLAGS')) target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS')) target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH')) + target.set('CDIST_DIRECTORY', target.directory) target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"') if target.debug: target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg') - 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') @@ -584,6 +636,9 @@ def make_appimage(target, nice_name, internal_name, version): nice_filename = nice_name.replace(' ', '_') os.makedirs('build/%s.AppDir/usr/bin' % nice_filename) target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename)) + target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename)) + target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename) + target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f: print('#!/bin/bash', file=f) print('export APPDIR="$(dirname "$(readlink -f "$0")")"', file=f) @@ -615,6 +670,8 @@ def package(target, version, options): out.append(make_appimage(target, 'DCP-o-matic Playlist Editor', 'dcpomatic2_playlist', version)) out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version)) out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version)) + out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version)) + out.append(make_appimage(target, 'DCP-o-matic Disk Writer', 'dcpomatic2_disk', version)) return out else: if target.bits == 32: @@ -626,8 +683,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' % target.directory) + elif target.platform == 'osx' and target.bits is None: + target.command('bash platform/osx/make_dmg.sh %s %s universal no %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')