ffmpeg_options = {}
if target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg', '2fb5e99b45e92880bd7953cb98c2027a34884c14', ffmpeg_options)]
+ deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', '9f7980e15f14c0d5f6b59e53b9bf939e62df20c9'))
+ deps.append(('libdcp', '8305f28ea22a834cc4a9e4b324110b5ff4ba1bd1'))
deps.append(('libsub', 'v1.6.44'))
deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
deps.append(('rtaudio', 'f619b76'))
deps.append(('openssl', '7f29dd5'))
if can_build_disk(target):
deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f'))
- deps.append(('ffcmp', '15e7fdf0b3896e3f7323a950105382a9c8ae3c39'))
+ 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')
"""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 = []
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