# -*- mode: python -*-
#
-# Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
#
# This file is part of DCP-o-matic.
#
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['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)
+deb_build_depends['10'].extend(['libssh-gcrypt-dev'])
deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
deb_depends = 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',
'libnettle6',
'libssh-4',
'libx264-152',
- 'libcurl4'])
-
-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',
+ 'libcurl4',
+ 'libpulse0'])
+
+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',
- 'libzip4',
- 'libwxgtk3.0-0v5',
- 'libicu60',
- 'libnettle6',
+ 'libzip5',
+ 'libwxgtk3.0-gtk3-0v5',
+ 'libicu66',
+ 'libnettle7',
'libssh-4',
- 'libx264-152',
- 'libcurl4'])
-
-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'])
+ 'libx264-155',
+ 'libcurl4',
+ 'libpulse0',
+ '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',
+ 'libcairomm-1.0-1v5',
+ 'libpangomm-1.4-1v5',
+ 'libxml++2.6-2v5',
+ 'libzip5',
+ 'libicu67',
+ 'libnettle8',
+ 'libssh-4',
+ 'libx264-160',
+ 'libcurl4',
+ 'libpulse0',
+ 'libxerces-c3.2',
+ 'libnanomsg5'])
deb_depends['9'] = copy.deepcopy(deb_depends_base)
deb_depends['9'].extend(['libboost-filesystem1.62.0',
'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'])
+
+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'])
def packages(name, packages, f):
s = '%s: ' % name
print('%{_bindir}/dcpomatic2_server_cli', file=f)
print('%{_bindir}/dcpomatic2_kdm_cli', file=f)
print('%{_bindir}/dcpomatic2_player', file=f)
+ print('%{_bindir}/dcpomatic2_playlist', 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}/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)
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_playlist.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', 'ar_LB', 'fi_FI', 'el_GR', '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)
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', '4676616'))
- deps.append(('libsub', 'f93c12c'))
- deps.append(('rtaudio-cdist', 'aad62d7'))
+ deps.append(('libdcp', 'v1.6.x-laszlo'))
+ deps.append(('libsub', 'v1.4.x-laszlo'))
+ deps.append(('rtaudio-cdist', 'bf0fc23'))
return deps
def configure_options(target, options):
opt = ''
- if not (target.platform == 'linux' and target.distro == 'ubuntu' and (target.version == '18.04' or target.version == '16.04')):
- # Currently we only build tests on Ubuntu 1{6,8}.04
+ if not (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04'):
+ # Currently we only build tests on Ubuntu 18.04
opt += ' --disable-tests'
if target.debug:
'sources': [{'type': 'archive',
'url': '%s/pangomm-2.40.1.tar.xz' % prefix,
'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]})
- modules.append({'name': 'libxml++',
+ 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',
+ 'sha256': '967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2'}]})
+ modules.append({'name': 'openjpeg2',
'buildsystem': 'cmake',
'sources': [{'type': 'dir', 'path': os.path.abspath('../openjpeg2-cdist')}]})
- modules.append({'name': 'boost',
+ modules.append({'name': 'boost',
'buildsystem': 'simple',
'build-commands': [
'./bootstrap.sh --prefix=/app',
'sources': [{'type': 'archive',
'url': '%s/boost_1_66_0.tar.bz2' % prefix,
'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]})
- modules.append({'name': 'asdcplib',
+ 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',
+ 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',
+ 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',
+ 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',
+ 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',
+ modules.append({'name': 'rtaudio',
'build-options': {
'config-opts': [
'--prefix=/app',
]
},
'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]})
- modules.append({'name': 'wxwidgets',
+ modules.append({'name': 'wxwidgets',
'sources': [{'type': 'archive',
'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix,
'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]})
- modules.append({'name': 'libssh',
+ 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',
+ modules.append({'name': 'dcpomatic',
'buildsystem': 'simple',
'build-commands': [
'./waf configure --prefix=/app build install'
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)
out = []
out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version))
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))
return out
else:
if target.bits == 32:
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 %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')