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 ['23.04']:
+ deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+ deb_build_depends[v].extend(['libssh-dev', 'python3.11'])
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(['python3'])
'libxerces-c3.2',
'libnanomsg5'])
+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',
+ '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'])
deb_depends['9'] = copy.deepcopy(deb_depends_base)
deb_depends['9'].extend(['libboost-filesystem1.62.0',
'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',
print('%{_bindir}/dcpomatic2_combiner', file=f)
print('%{_bindir}/dcpomatic2_verify', file=f)
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}/dcpomatic2/no_tick.png', file=f)
print('%{_datadir}/dcpomatic2/link.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)
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', 'sl_SI', 'hu_HU']:
+ 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'sl_SI', 'hu_HU', 'ka_KA']:
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)
ffmpeg_options = {}
if target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg-cdist', '4721b55de017702b0d1c8ce1163331378905c637', ffmpeg_options)]
+ deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.45'))
- deps.append(('libsub', 'v1.6.42'))
- deps.append(('leqm-nrt', '93ae9e6'))
+ deps.append(('libdcp', '8305f28ea22a834cc4a9e4b324110b5ff4ba1bd1'))
+ deps.append(('libsub', 'v1.6.44'))
+ deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
# also need a patched openssl binary to make certificates.
# the appropriate place later
deps.append(('openssl', '7f29dd5'))
if can_build_disk(target):
- deps.append(('lwext4', 'ee865fa65f05e348cd4e0bce0552a2725ad5663a'))
- deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169'))
+ deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f'))
+ deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237'))
return deps
def build(target, options, for_package):
if target.platform == 'flatpak':
- target.checkout_dependencies()
- prefix = 'https://dcpomatic.com/deps'
+ prefix = 'https://dcpomatic.com/deps/linux'
modules = []
- modules.append({'name': 'libzip',
- 'buildsystem': 'cmake',
- 'sources': [{'type': 'archive',
- 'url': '%s/libzip-1.4.0.tar.xz' % prefix,
- 'sha256': 'e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1'}]})
- modules.append({'name': 'libsigc++',
- 'sources': [{'type': 'archive',
- 'url': '%s/libsigc++-2.10.0.tar.xz' % prefix,
- 'sha256': 'f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81'}]})
- modules.append({'name': 'glibmm',
- 'sources': [{'type': 'archive',
- 'url': '%s/glibmm-2.48.1.tar.xz' % prefix,
- 'sha256': 'dc225f7d2f466479766332483ea78f82dc349d59399d30c00de50e5073157cdf'}]})
- modules.append({'name': 'cairomm',
- 'sources': [{'type': 'archive',
- 'url': '%s/cairomm-1.12.2.tar.gz' % prefix,
- 'sha256': '45c47fd4d0aa77464a75cdca011143fea3ef795c4753f6e860057da5fb8bd599'}]})
- modules.append({'name': 'pangomm',
- 'sources': [{'type': 'archive',
- 'url': '%s/pangomm-2.40.1.tar.xz' % prefix,
- 'sha256': '9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af'}]})
- 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',
+
+ def waf(name, config=''):
+ modules.append({'name': name,
+ 'buildsystem': 'simple',
+ 'sources': [{'type': 'dir',
+ 'path': '../../%s' % name}],
+ 'build-commands': [
+ './waf configure --prefix=/app --libdir=/app/lib %s' % config,
+ './waf install',
+ ]})
+
+ waf('leqm-nrt', '--without-libsndfile')
+ waf('libcxml', '--disable-tests')
+ modules.append({'name': 'openjpeg',
'buildsystem': 'cmake',
- 'sources': [{'type': 'dir', 'path': os.path.abspath('../openjpeg2-cdist')}]})
- modules.append({'name': 'boost',
- 'buildsystem': 'simple',
- 'build-commands': [
- './bootstrap.sh --prefix=/app',
- './b2 install'
- ],
- 'sources': [{'type': 'archive',
- 'url': '%s/boost_1_66_0.tar.bz2' % prefix,
- 'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]})
- 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-carl')}]})
- 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',
- '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',
- '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',
- 'buildsystem': 'simple',
- 'build-commands': [
- './waf configure --prefix=/app --libdir=/app/lib build install'
- ],
- 'sources': [{'type': 'dir', 'path': os.path.abspath('../libsub')}]})
+ 'config-opts': ['-DBUILD_PKGCONFIG_FILES=ON'],
+ 'sources': [{'type': 'dir',
+ 'path': '../../openjpeg'}],
+ })
+ waf('asdcplib')
+ waf('libdcp', '--disable-tests --disable-examples --disable-benchmarks')
+ waf('libsub', '--disable-tests')
+ modules.append({'name': 'ffmpeg',
+ 'buildsystem': 'autotools',
+ 'config-opts': ['--disable-indev=jack', '--enable-gpl', '--enable-libx264', '--enable-libdav1d', '--enable-shared'],
+ 'sources': [{'type': 'dir',
+ 'path': '../../ffmpeg'}],
+ })
modules.append({'name': 'rtaudio',
- 'build-options': {
- 'config-opts': [
- '--prefix=/app',
- '--with-pulse',
- '--with-alsa'
- ]
- },
- 'sources': [{'type': 'dir', 'path': os.path.abspath('../rtaudio-cdist')}]})
- modules.append({'name': 'wxwidgets',
- 'sources': [{'type': 'archive',
- 'url': '%s/wxWidgets-3.0.3.tar.bz2' % prefix,
- 'sha256': '08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b'}]})
- 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',
- 'buildsystem': 'simple',
- 'build-commands': [
- './waf configure --prefix=/app build install'
- ],
- 'build-options': {
- 'build-args': ['--share=network']
- },
- 'sources': [{'type': 'dir', 'path': os.path.abspath('.')}]})
+ 'buildsystem': 'autotools',
+ 'config-opts': ['--with-pulse', '--with-alsa'],
+ 'sources': [{'type': 'dir',
+ 'path': '../../rtaudio'}],
+ })
+ waf('dcpomatic', '--disable-tests')
desc = {'app-id': 'com.dcpomatic.DCP-o-matic',
'runtime': 'org.gnome.Sdk',
- 'runtime-version': '3.26',
+ 'runtime-version': '3.38',
+ 'base': 'com.dcpomatic.Base',
'sdk': 'org.gnome.Sdk',
'command': 'dcpomatic2',
'finish-args': ['--socket=x11', '--share=ipc', '--share=network', '--socket=pulseaudio', '--filesystem=host'],
os.makedirs('build/platform')
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())
+ target.command('%s -v --user --repo=build/platform/repo build/platform/flatpak --gpg-sign 70AAE40A90A2466AD8C57ADEF85070CB89F81088 --gpg-homedir=/tmp/gpg build/com.dcpomatic.DCP-o-matic.json' % target.flatpak_builder())
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.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"')
target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
+ target.set('CDIST_WX_VERSION', "3.2" if target.version == "23.04" else "3.1")
if not target.debug:
target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')
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}/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/')
"""version: DCP-o-matic version string"""
if target.platform == 'windows':
return package_windows(target)
+ elif target.platform == 'flatpak':
+ target.command('%s build-bundle build/platform/repo build/dcpomatic_%s.flatpak com.dcpomatic.DCP-o-matic' % (target.flatpak(), version))
+ return os.path.abspath('build/dcpomatic_%s.flatpak' % version)
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))
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 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"))
- elif x.find("Editor") != -1:
- packages.append((a, "com.dcpomatic.editor"))
- else:
- packages.append((a, "com.dcpomatic"))
- return packages
+ 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')
f.close()
target.command('docker build build/platform/docker -t dcpomatic-server:%s' % version)
target.command('docker save dcpomatic-server:%s -o dcpomatic-server-%s-docker.tar' % (version, version))
- elif target.platform == 'flatpak':
- target.command('%s build-bundle build/platform/repo build/dcpomatic_%s.flatpak com.dcpomatic.DCP-o-matic' % (target.flatpak(), version))
- return os.path.abspath('build/dcpomatic_%s.flatpak' % version)
def make_pot(target):
target.command('./waf pot')
projects / dcpomatic.git / blobdiff