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.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['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)
'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',
+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',
'libxerces-c3.2',
'libnanomsg5'])
-deb_depends['20.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['20.04'].extend(['libboost-filesystem1.71.0',
+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',
if target.platform == 'osx':
return True
if target.platform == 'linux':
- if target.distro == 'ubuntu' and target.version in ['18.04', '19.10', '20.04']:
+ if target.distro == 'ubuntu' and target.version in ['18.04', '20.04', '20.10']:
return True
if target.distro == 'debian' and target.version == '10':
return True
print('%{_bindir}/dcpomatic2_player', file=f)
print('%{_bindir}/dcpomatic2_playlist', file=f)
print('%{_bindir}/dcpomatic2_openssl', file=f)
+ print('%{_bindir}/dcpomatic2_combiner', file=f)
if options['variant'] == 'swaroop-studio':
print('%{_bindir}/dcpomatic2_ecinema', file=f)
print('%{_bindir}/dcpomatic2_uuid', 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)
+ print('%{_datadir}/applications/dcpomatic2_combiner.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}/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)
+ 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', 'ko_KR']:
+ 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR']:
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)
else:
ffmpeg_options = {}
- 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', 'c048a3f', ffmpeg_options)]
+ if target.platform != 'linux' or target.distro != 'arch':
+ deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
(target.platform == 'osx' and target.bits == 64) or
(target.platform == 'windows')) else {}
- deps.append(('libdcp', 'c6c18f4', cpp_lib_options))
- deps.append(('libsub', '67fff3c', cpp_lib_options))
+ deps.append(('libdcp', '9d1c856', cpp_lib_options))
+ deps.append(('libsub', '1b52b38', cpp_lib_options))
deps.append(('leqm-nrt', 'carl'))
deps.append(('rtaudio', 'carl'))
# We get our OpenSSL libraries from the environment, but we
option_defaults = { "gui": True, "variant": None }
def configure_options(target, options):
- opt = ''
+ opt = ' --warnings-are-errors'
- if not (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04'):
- # Currently we only build tests on Ubuntu 18.04
+ if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or
+ (target.platform == 'osx') or
+ (target.platform == 'windows')):
+ # Currently we only build tests on Ubuntu 18.04, macOS and Windows
opt += ' --disable-tests'
if target.debug:
else:
target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
target.command('./waf')
-
- if target.platform == 'linux' or target.platform == 'osx':
- target.command('./waf install')
+ target.command('./waf install')
def package_windows(target):
identifier = ''
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')]
+ 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"))
+ else:
+ packages.append((a, "com.dcpomatic"))
+ return packages
elif target.platform == 'docker':
shutil.copyfile(target.deb, 'build/platform/docker')
f = open('build/platform/docker/Dockerfile', 'w')