for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']:
deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
deb_build_depends[v].extend(['libssh-dev', 'python'])
-for v in ['22.04']:
+for v in ['22.04', '22.10']:
deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
deb_build_depends[v].extend(['libssh-dev', 'python3.10'])
for v in ['9', '10']:
'libpangomm-1.4-1v5',
'libxml++2.6-2v5',
'libzip4',
- 'libicu67',
+ 'libicu70',
'libnettle8',
'libssh-4',
- 'libx264-160',
+ 'libx264-163',
'libcurl4',
'libpulse0',
'libxerces-c3.2',
'libnanomsg5',
- 'libdav1d4'])
+ 'libdav1d5'])
+
+deb_depends['22.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['22.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',
+ 'libicu71',
+ 'libnettle8',
+ 'libssh-4',
+ 'libx264-164',
+ 'libcurl4',
+ 'libpulse0',
+ 'libxerces-c3.2',
+ 'libnanomsg5'])
+
deb_depends['9'] = copy.deepcopy(deb_depends_base)
deb_depends['9'].extend(['libboost-filesystem1.62.0',
print('%{_bindir}/dcpomatic2_openssl', file=f)
print('%{_bindir}/dcpomatic2_combiner', file=f)
print('%{_bindir}/dcpomatic2_verify', file=f)
+ print('%{_bindir}/dcpomatic2_kdm_inspect', 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)
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/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/tick.png', file=f)
print('%{_datadir}/dcpomatic2/no_tick.png', file=f)
print('%{_datadir}/dcpomatic2/link.png', 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']:
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('/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)
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'f031667bd2769d3daf9c49115f21a099fafcee46'))
- deps.append(('libsub', '7ed26aa4ddb33c9c01a3a22fe99c7759321b1246'))
+ deps.append(('libdcp', 'v1.8.34'))
+ deps.append(('libsub', 'v1.6.41'))
deps.append(('leqm-nrt', '93ae9e6'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
# the appropriate place later
deps.append(('openssl', '7f29dd5'))
if can_build_disk(target):
- deps.append(('lwext4', 'cce3730'))
+ deps.append(('lwext4', 'ee865fa65f05e348cd4e0bce0552a2725ad5663a'))
deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169'))
return deps
opt = ' --warnings-are-errors'
if for_package or not (
- (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or
+ (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
+ # Currently we only build tests on macOS, Windows, and some Ubuntu versions
opt += ' --disable-tests'
if target.debug:
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')
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/')
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))
+ 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)
packages = []
for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'):
a = os.path.abspath(x)
if target.platform == 'windows':
cmd = 'run\\tests '
else:
- cmd = 'run/tests '
+ cmd = 'run/tests --check --log_level=test_suite '
if target.debug:
cmd += '--backtrace '
if test is not None:
projects / dcpomatic.git / blobdiff