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['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)
'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',
'libssh-4',
'libx264-152',
'libcurl4',
- 'libpulse0'])
+ 'libpulse0',
+ 'libxerces-c3.2',
+ 'libnanomsg4'])
-deb_depends['19.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['19.04'].extend(['libboost-filesystem1.67.0',
+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',
'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.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['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',
'libssh-gcrypt-4',
'libnettle6',
'libx264-148',
- 'libcurl3'])
+ 'libcurl3',
+ 'libxerces-c3.1'])
deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5',
'libxcb-xfixes0',
'libssh-gcrypt-4',
'libnettle6',
'libx264-155',
- 'libcurl4'])
+ 'libcurl4',
+ 'libxerces-c3.2',
+ 'libnanomsg5'])
deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5',
'libxcb-xfixes0',
'libicu63',
'libnettle6',
'libx264-155',
- 'libcurl4'])
+ '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 don't have a new enough boost (1.64 or above)
+ # - 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
- return target.platform == 'windows' or target.platform == 'osx' or (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '18.10', '19.04'])
+ 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
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)
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', 'ko_KR']:
print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
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', '20d3ddf', ffmpeg_options)]
+ deps = [('ffmpeg-cdist', '7427ffe', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
# the appropriate place later
deps.append(('openssl', 'carl'))
if can_build_disk(target):
- deps.append(('lwext4', 'carl2'))
+ deps.append(('lwext4', '370b3de6'))
return deps
-option_defaults = { "gui": True, "variant": None, "disk": False }
+option_defaults = { "gui": True, "variant": None }
def configure_options(target, options):
opt = ''
if target.debug and target.platform == 'windows':
opt += ' --static-dcpomatic'
- if can_build_disk(target) and options['disk']:
+ if can_build_disk(target):
opt += ' --enable-disk'
return opt
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:
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 %s' % (target.environment_prefix, target.directory, "yes" if options['disk'] else "no", target.apple_id, target.apple_password))
+ 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')
projects / dcpomatic.git / blobdiff