# -*- mode: python -*-
#
-# Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
#
# This file is part of DCP-o-matic.
#
deb_build_depends_base = ['debhelper', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev']
-for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']:
+for v in ['16.04', '18.04', '20.04']:
deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
deb_build_depends[v].extend(['libssh-dev', 'python'])
+for v in ['22.04']:
+ deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+ deb_build_depends[v].extend(['libssh-dev', 'python3.10'])
+for v in ['23.04', '23.10']:
+ deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+ deb_build_depends[v].extend(['libssh-dev', 'python3.11'])
+for v in ['24.04']:
+ deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+ deb_build_depends[v].extend(['libssh-dev', 'python3.12'])
for v in ['9', '10']:
deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python'])
for v in ['11']:
deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.9'])
+for v in ['12']:
+ deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+ deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.11'])
deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['unstable'].extend(['python'])
+deb_build_depends['unstable'].extend(['python3'])
deb_depends = dict()
deb_depends_gui = dict()
'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',
+deb_depends['21.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['21.10'].extend(['libboost-filesystem1.74.0',
+ 'libboost-thread1.74.0',
+ 'libboost-regex1.74.0',
+ 'libboost-date-time1.74.0',
'libcairomm-1.0-1v5',
'libpangomm-1.4-1v5',
'libxml++2.6-2v5',
- 'libzip5',
+ 'libzip4',
'libicu67',
'libnettle8',
'libssh-4',
'libcurl4',
'libpulse0',
'libxerces-c3.2',
- 'libnanomsg5'])
+ 'libnanomsg5',
+ 'libdav1d4'])
-deb_depends['21.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['21.04'].extend(['libboost-filesystem1.74.0',
+deb_depends['22.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['22.04'].extend(['libboost-filesystem1.74.0',
'libboost-thread1.74.0',
'libboost-regex1.74.0',
'libboost-date-time1.74.0',
'libpangomm-1.4-1v5',
'libxml++2.6-2v5',
'libzip4',
- 'libicu67',
+ 'libicu70',
'libnettle8',
'libssh-4',
- 'libx264-160',
+ 'libx264-163',
'libcurl4',
'libpulse0',
'libxerces-c3.2',
- 'libnanomsg5'])
+ 'libnanomsg5',
+ 'libdav1d5'])
-deb_depends['21.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['21.10'].extend(['libboost-filesystem1.74.0',
+deb_depends['23.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['23.04'].extend(['libboost-filesystem1.74.0',
'libboost-thread1.74.0',
'libboost-regex1.74.0',
'libboost-date-time1.74.0',
'libpangomm-1.4-1v5',
'libxml++2.6-2v5',
'libzip4',
- 'libicu67',
+ 'libicu72',
'libnettle8',
'libssh-4',
- 'libx264-160',
+ 'libx264-164',
'libcurl4',
'libpulse0',
'libxerces-c3.2',
- 'libnanomsg5'])
+ 'libnanomsg5',
+ 'libwxgtk3.2-1',
+ 'libwxgtk-gl3.2-1'])
+
+deb_depends['23.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['23.10'].extend(['libboost-filesystem1.74.0',
+ 'libboost-thread1.74.0',
+ 'libboost-regex1.74.0',
+ 'libboost-date-time1.74.0',
+ 'libcairomm-1.0-1v5',
+ 'libpangomm-1.4-1v5',
+ 'libxml++2.6-2v5',
+ 'libzip4',
+ 'libicu72',
+ 'libnettle8',
+ 'libssh-4',
+ 'libx264-164',
+ 'libcurl4',
+ 'libpulse0',
+ 'libxerces-c3.2',
+ 'libnanomsg5',
+ 'libwxgtk3.2-1',
+ 'libwxgtk-gl3.2-1'])
+
+def debs(boost, icu, x264):
+ output = copy.deepcopy(deb_depends_base)
+ output.extend(['libboost-filesystem' + boost,
+ 'libboost-thread' + boost,
+ 'libboost-regex' + boost,
+ 'libboost-date-time' + boost,
+ 'libcairomm-1.0-1v5',
+ 'libpangomm-1.4-1v5',
+ 'libxml++2.6-2v5',
+ 'libzip4',
+ 'libicu' + icu,
+ 'libnettle8',
+ 'libssh-4',
+ 'libx264-' + x264,
+ 'libcurl4',
+ 'libpulse0',
+ 'libxerces-c3.2',
+ 'libnanomsg5',
+ 'libwxgtk3.2-1',
+ 'libwxgtk-gl3.2-1'])
+ return output
+
+deb_depends['24.04'] = debs(boost='1.83.0', icu='74', x264='164')
deb_depends['9'] = copy.deepcopy(deb_depends_base)
deb_depends['9'].extend(['libboost-filesystem1.62.0',
'libx264-160',
'libcurl4',
'libxerces-c3.2',
- 'libnanomsg5'])
+ 'libnanomsg5',
+ 'libdav1d4'])
deb_depends_gui['11'] = [ 'libxcb-xfixes0',
'libxcb-shape0',
'libasound2',
'libpulse0' ]
+deb_depends['12'] = copy.deepcopy(deb_depends_base)
+deb_depends['12'].extend(['libboost-filesystem1.74.0',
+ 'libboost-thread1.74.0',
+ 'libboost-regex1.74.0',
+ 'libboost-date-time1.74.0',
+ 'libxml++2.6-2v5',
+ 'libzip4',
+ 'libcairomm-1.0-1v5',
+ 'libpangomm-1.4-1v5',
+ 'libicu72',
+ 'libssh-4',
+ 'libssh-gcrypt-4',
+ 'libnettle8',
+ 'libx264-164',
+ 'libcurl4',
+ 'libxerces-c3.2',
+ 'libnanomsg5'])
+
+deb_depends_gui['12'] = [ 'libxcb-xfixes0',
+ 'libxcb-shape0',
+ 'libasound2',
+ 'libpulse0' ]
+
deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
deb_depends['unstable'].extend(['libboost-filesystem1.67.0',
'libboost-thread1.67.0',
'libnettle6',
'libx264-155',
'libcurl4',
- 'libxerces-c3.2'])
+ 'libxerces-c3.2',
+ 'libdav1d4'])
def can_build_disk(target):
# We can build dcpomatic2_disk on platforms that have Boost process and can build the lwext4
print('', file=f)
suffix = '' if gui else '-cli'
print(f'Package: dcpomatic{suffix}', file=f)
+ if gui:
+ print('Replaces: dcpomatic-cli', file=f)
if bits == 32:
print('Architecture: i386', file=f)
else:
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)
print('%{_bindir}/dcpomatic2_batch', file=f)
print('%{_bindir}/dcpomatic2_cli', file=f)
print('%{_bindir}/dcpomatic2_create', file=f)
+ print('%{_bindir}/dcpomatic2_editor', file=f)
print('%{_bindir}/dcpomatic2_kdm', file=f)
print('%{_bindir}/dcpomatic2_server', file=f)
print('%{_bindir}/dcpomatic2_server_cli', file=f)
print('%{_bindir}/dcpomatic2_openssl', file=f)
print('%{_bindir}/dcpomatic2_combiner', file=f)
print('%{_bindir}/dcpomatic2_verify', file=f)
- if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
+ print('%{_bindir}/dcpomatic2_kdm_inspect', file=f)
+ print('%{_bindir}/dcpomatic2_map', file=f)
+ if can_build_disk(target):
print('%{_bindir}/dcpomatic2_disk', file=f)
print('%caps(cap_dac_override=ep) %{_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_editor.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_combiner.desktop', file=f)
- if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
+ if can_build_disk(target):
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)
- print('%{_datadir}/dcpomatic2/snap.png', file=f)
- print('%{_datadir}/dcpomatic2/zoom.png', file=f)
- 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/link.png', file=f)
+ print('%{_datadir}/dcpomatic2/select_white.png', file=f)
+ print('%{_datadir}/dcpomatic2/select_black.png', file=f)
+ print('%{_datadir}/dcpomatic2/sequence_white.png', file=f)
+ print('%{_datadir}/dcpomatic2/sequence_black.png', file=f)
+ print('%{_datadir}/dcpomatic2/snap_white.png', file=f)
+ print('%{_datadir}/dcpomatic2/snap_black.png', file=f)
+ print('%{_datadir}/dcpomatic2/zoom_white.png', file=f)
+ print('%{_datadir}/dcpomatic2/zoom_black.png', file=f)
+ print('%{_datadir}/dcpomatic2/zoom_all_white.png', file=f)
+ print('%{_datadir}/dcpomatic2/zoom_all_black.png', file=f)
+ print('%{_datadir}/dcpomatic2/link_black.png', file=f)
+ print('%{_datadir}/dcpomatic2/link_white.png', file=f)
print('%{_datadir}/dcpomatic2/me.jpg', file=f)
+ print('%{_datadir}/dcpomatic2/add_black.png', file=f)
+ print('%{_datadir}/dcpomatic2/add_white.png', file=f)
+ print('%{_datadir}/dcpomatic2/pause_black.png', file=f)
+ print('%{_datadir}/dcpomatic2/pause_white.png', 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)
for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']:
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r, file=f)
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f)
+ print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_editor.png' % r, file=f)
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f)
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_disk.png' % r, file=f)
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_combiner.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', 'sl_SI', 'hu_HU',
+ 'ka_KA', 'fa_IR']:
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)
print('%{_datadir}/libdcp/tags/*', file=f)
print('%{_datadir}/libdcp/xsd/*', file=f)
+ print('%{_datadir}/libdcp/ratings', file=f)
print('%{_datadir}/polkit-1/actions/com.dcpomatic.write-drive.policy', file=f)
print('', file=f)
print('%prep', 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 --destdir=/usr %s' %
- (target.directory, target.directory, configure_options(target, options)), file=f)
+ (target.directory, target.directory, configure_options(target, options, for_package=True)), file=f)
print('./waf', file=f)
print('%install', file=f)
print('cd dcpomatic-%s' % version, file=f)
print('/bin/mkdir -p %{buildroot}/usr/share/libdcp', file=f)
print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
+ print('/bin/cp %s/src/libdcp/ratings %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
print('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify' % target.directory, file=f)
+ print('/bin/mv %s/bin/dcpkdm %%{buildroot}/usr/bin/dcpomatic2_kdm_inspect' % target.directory, file=f)
print('', file=f)
print('%post', file=f)
print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
ffmpeg_options = {}
if target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg-cdist', '107f9af8', ffmpeg_options)]
+ deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.5'))
- deps.append(('libsub', 'v1.6.5'))
- deps.append(('leqm-nrt', '93ae9e6'))
+ deps.append(('libdcp', 'v1.8.100'))
+ deps.append(('libsub', 'v1.6.47'))
+ deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
deps.append(('rtaudio', 'f619b76'))
# 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', '7f29dd5'))
+ deps.append(('openssl', '54298369cacfe0ae01c5aa42ace8a463fd2e7a2e'))
if can_build_disk(target):
- deps.append(('lwext4', 'cce3730'))
- deps.append(('ffcmp', '6259cd4'))
+ deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f'))
+ deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237'))
return deps
option_defaults = { "gui": True, "variant": None }
-def configure_options(target, options):
+def configure_options(target, options, for_package=False):
opt = ' --warnings-are-errors'
- if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or
+ if for_package or not (
+ (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '22.04']) or
(target.platform == 'osx') or
- (target.platform == 'windows')):
- # Currently we only build tests on Ubuntu 18.04, macOS and Windows
+ (target.platform == 'windows')
+ ):
+ # Currently we only build tests on macOS, Windows, and some Ubuntu versions
opt += ' --disable-tests'
if target.debug:
opt += ' --enable-debug'
if target.platform == 'windows':
- opt += ' --target-windows'
+ opt += f' --target-windows-{target.bits}'
elif target.platform == 'linux':
opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
if target.distro == 'centos':
opt += ' --enable-disk'
if target.platform == 'osx' and target.arch == 'arm64':
- opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin
+ opt += ' --wx-config=%s/wx-config' % target.bin
return opt
-def build(target, options):
+def build(target, options, for_package):
if target.platform == 'flatpak':
target.checkout_dependencies()
prefix = 'https://dcpomatic.com/deps'
with open('build/com.dcpomatic.DCP-o-matic.json', 'w') as outfile:
json.dump(desc, outfile)
target.command('%s --repo=build/platform/repo build/platform/flatpak build/com.dcpomatic.DCP-o-matic.json' % target.flatpak_builder())
- else:
- target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
+ elif target.platform != 'linux' or target.detail == 'appimage' or not for_package:
+ target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options, for_package)))
target.command('./waf')
target.command('./waf install')
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) + '"')
+ target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"')
target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
- if target.debug:
- target.set('CDIST_DEBUG_PACKAGE_FLAG', f'--dbg-package=dcpomatic{suffix}-dbg')
+ target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10", "24.04") else "3.1")
+ if not target.debug:
+ target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')
target.command('dpkg-buildpackage -uc -us')
requires = None
if target.distro == 'mageia':
- requires = "lib64xmlsec1-devel lib64canberra-gtk0"
+ requires = "lib64xmlsec1-devel lib64canberra-gtk0 libcap-utils"
- make_spec('build/platform/linux/dcpomatic2.spec', version, target, options, requires)
- cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir
+ make_spec('dcpomatic2.spec', version, target, options, requires)
+ cmd = 'rpmbuild --define "_topdir %s" -bb dcpomatic2.spec' % topdir
+ # On Centos 7 we build and install boost ourselves, so we must look for it in the right place
+ target.set('LINKFLAGS', '-L/usr/local/lib')
target.command(cmd)
rpms = []
return rpms
-def make_appimage(target, nice_name, internal_name, version):
+def make_appimage(target, nice_name, internal_name, version, extra_binaries=None):
nice_filename = nice_name.replace(' ', '_')
appdir = f'build/{nice_filename}.AppDir'
os.makedirs(f'{appdir}/usr/bin')
target.command(f'cp {target.directory}/bin/{internal_name} {appdir}/usr/bin')
target.command(f'cp {target.directory}/src/openssl/apps/openssl {appdir}/usr/bin/dcpomatic2_openssl')
target.command(f'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify')
+ target.command(f'cp {target.directory}/bin/dcpkdm {appdir}/usr/bin/dcpomatic2_kdm_inspect')
+ if extra_binaries:
+ for bin in extra_binaries:
+ target.command(f'cp {target.directory}/bin/{bin} {appdir}/usr/bin')
target.command(f'mkdir -p {appdir}/usr/share/libdcp')
target.command(f'cp -r {target.directory}/share/dcpomatic2 {appdir}/usr/share/')
target.command(f'cp -r {target.directory}/share/libdcp/xsd {appdir}/usr/share/libdcp/')
target.command(f'cp -r {target.directory}/share/libdcp/tags {appdir}/usr/share/libdcp/')
+ target.command(f'cp {target.directory}/share/libdcp/ratings {appdir}/usr/share/libdcp/')
lib = 'usr/lib/x86_64-linux-gnu'
target.command(f'mkdir -p build/{nice_filename}.AppDir/{lib}/gdk-pixbuf-2.0/2.10.0')
target.command(f'cp -a /{lib}/gdk-pixbuf-2.0 build/{nice_filename}.AppDir/usr/lib/x86_64-linux-gnu/')
+ target.command('sudo apt update')
+ for package in ['libc6', 'libglib2.0-0', 'gnome-settings-daemon-schemas', 'librsvg2-common', 'libgdk-pixbuf2.0-0', 'libpango-1.0-0', 'libpangoft2-1.0-0', 'libpangocairo-1.0-0', 'libthai0']:
+ target.command(f'apt download {package}')
+ target.command(f'dpkg-deb -x {package}*.deb {appdir}')
+ target.command(f'glib-compile-schemas {appdir}/usr/share/glib-2.0/schemas')
+ target.command(f'sed -i -e "s|/usr/lib/x86_64-linux-gnu/gdk-pixbuf-.*/.*/loaders/||g" {appdir}/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache')
+ # Stop anything loading from outside the AppImage
+ target.command(f'sed -i -e "s|/usr|/xxx|g" {appdir}/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2')
+
if internal_name == 'dcpomatic2_disk':
target.command(f'mkdir -p {appdir}/usr/share/polkit-1/actions')
target.command(f'cp {target.directory}/share/polkit-1/actions/com.dcpomatic.write-drive.policy {appdir}/usr/share/polkit-1/actions')
print('#!/bin/bash', file=f)
print('export PATH=$APPDIR/usr/bin:$PATH', file=f)
print('export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS"', file=f)
- print('export LD_LIBRARY_PATH=$APPDIR/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}', file=f)
+ print('export GDK_PIXBUF_MODULEDIR=$(readlink -f "$APPDIR"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/ )', file=f)
+ print('export GDK_PIXBUF_MODULE_FILE=$(readlink -f "$APPDIR"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache )', file=f)
+ print('export LD_LIBRARY_PATH=$GDK_PIXBUF_MODULEDIR:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu', file=f)
print(f'"$APPDIR"/usr/bin/{internal_name} $@', file=f)
target.command(f'chmod a+rx {appdir}/AppRun')
with open(f'{appdir}/{internal_name}.desktop', 'w') as f:
elif target.platform == 'linux':
if target.detail == 'appimage':
out = []
- out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version))
+ out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version, ('dcpomatic2_map', 'dcpomatic2_cli')))
out.append(make_appimage(target, 'DCP-o-matic Player', 'dcpomatic2_player', version))
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 Combiner', 'dcpomatic2_combiner', version))
+ out.append(make_appimage(target, 'DCP-o-matic Editor', 'dcpomatic2_editor', version))
return out
else:
if target.bits == 32:
elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
return package_rpm(target, cpu, version, options)
elif target.platform == 'osx':
- archs = ' '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets)
- target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs))
- packages = []
- for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'):
- a = os.path.abspath(x)
- if x.find("Player") != -1:
- packages.append((a, "com.dcpomatic.player"))
- elif x.find("Playlist Editor") != -1:
- packages.append((a, "com.dcpomatic.playlist"))
- elif x.find("KDM Creator") != -1:
- packages.append((a, "com.dcpomatic.kdm"))
- elif x.find("Batch Converter") != -1:
- packages.append((a, "com.dcpomatic.batch"))
- elif x.find("Encode Server") != -1:
- packages.append((a, "com.dcpomatic.server"))
- elif x.find("Disk Writer") != -1:
- packages.append((a, "com.dcpomatic.disk"))
- elif x.find("Combiner") != -1:
- packages.append((a, "com.dcpomatic.combiner"))
- else:
- packages.append((a, "com.dcpomatic"))
- return packages
+ archs = '-a ' + ' -a '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets)
+ cmd = 'bash platform/osx/make_dmg.sh -e %s -r %s -i %s -p %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs)
+ if 'part' in options:
+ cmd += ' -b ' + options['part']
+ target.command(cmd)
+ return 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')
cmd = 'run\\tests '
else:
cmd = 'run/tests '
+ if target.environment_prefix:
+ cmd += '-e %s ' % target.environment_prefix
+ if target.platform != 'windows':
+ cmd += ' --check --log_level=test_suite '
if target.debug:
cmd += '--backtrace '
if test is not None:
projects / dcpomatic.git / blobdiff