for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']:
deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
deb_build_depends[v].extend(['libssh-dev', 'python'])
+for v in ['22.04']:
+ deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+ deb_build_depends[v].extend(['libssh-dev', 'python3.10'])
for v in ['9', '10']:
deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python'])
'libnanomsg5',
'libdav1d4'])
+deb_depends['22.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['22.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',
+ 'libicu70',
+ 'libnettle8',
+ 'libssh-4',
+ 'libx264-163',
+ 'libcurl4',
+ 'libpulse0',
+ 'libxerces-c3.2',
+ 'libnanomsg5',
+ 'libdav1d5'])
+
deb_depends['9'] = copy.deepcopy(deb_depends_base)
deb_depends['9'].extend(['libboost-filesystem1.62.0',
'libboost-thread1.62.0',
print('', file=f)
suffix = '' if gui else '-cli'
print(f'Package: dcpomatic{suffix}', file=f)
+ if gui:
+ print('Replaces: dcpomatic-cli', file=f)
if bits == 32:
print('Architecture: i386', file=f)
else:
print('%{_bindir}/dcpomatic2_batch', file=f)
print('%{_bindir}/dcpomatic2_cli', file=f)
print('%{_bindir}/dcpomatic2_create', file=f)
+ print('%{_bindir}/dcpomatic2_editor', file=f)
print('%{_bindir}/dcpomatic2_kdm', file=f)
print('%{_bindir}/dcpomatic2_server', file=f)
print('%{_bindir}/dcpomatic2_server_cli', file=f)
print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)
print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
+ print('%{_datadir}/applications/dcpomatic2_editor.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f)
for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']:
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r, file=f)
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f)
+ print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_editor.png' % r, 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}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
print('%{_datadir}/libdcp/tags/*', file=f)
print('%{_datadir}/libdcp/xsd/*', file=f)
+ print('%{_datadir}/libdcp/ratings', file=f)
print('%{_datadir}/polkit-1/actions/com.dcpomatic.write-drive.policy', file=f)
print('', file=f)
print('%prep', file=f)
print('cd dcpomatic-%s' % version, file=f)
print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig' % (target.directory, target.directory), file=f)
print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --destdir=/usr %s' %
- (target.directory, target.directory, configure_options(target, options)), file=f)
+ (target.directory, target.directory, configure_options(target, options, for_package=True)), file=f)
print('./waf', file=f)
print('%install', file=f)
print('cd dcpomatic-%s' % version, file=f)
print('/bin/mkdir -p %{buildroot}/usr/share/libdcp', file=f)
print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
+ print('/bin/cp %s/src/libdcp/ratings %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
print('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify' % target.directory, file=f)
print('', file=f)
print('%post', file=f)
ffmpeg_options = {}
if target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg-cdist', 'cb2b073d4f88230fca1d1d74e45235f5268fd825', ffmpeg_options)]
+ deps = [('ffmpeg-cdist', '4721b55de017702b0d1c8ce1163331378905c637', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.7'))
- deps.append(('libsub', 'v1.6.7'))
+ deps.append(('libdcp', 'v1.8.22'))
+ deps.append(('libsub', 'v1.6.23'))
deps.append(('leqm-nrt', '93ae9e6'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
deps.append(('openssl', '7f29dd5'))
if can_build_disk(target):
deps.append(('lwext4', 'cce3730'))
- deps.append(('ffcmp', '10934f1a9cd9770ef0b38da153f9576e77e7e925'))
+ deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169'))
return deps
option_defaults = { "gui": True, "variant": None }
-def configure_options(target, options):
+def configure_options(target, options, for_package=False):
opt = ' --warnings-are-errors'
- if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or
+ if for_package or not (
+ (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or
(target.platform == 'osx') or
- (target.platform == 'windows')):
+ (target.platform == 'windows')
+ ):
# Currently we only build tests on Ubuntu 18.04, macOS and Windows
opt += ' --disable-tests'
if target.debug:
opt += ' --enable-debug'
if target.platform == 'windows':
- opt += ' --target-windows'
+ opt += f' --target-windows-{target.bits}'
elif target.platform == 'linux':
opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
if target.distro == 'centos':
return opt
-def build(target, options):
+def build(target, options, for_package):
if target.platform == 'flatpak':
target.checkout_dependencies()
prefix = 'https://dcpomatic.com/deps'
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())
- elif target.platform != "linux" or target.detail == 'appimage':
- # Build here if the packaging step won't do it
- target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
+ 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.command('./waf install')
target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH'))
target.set('CDIST_DIRECTORY', target.directory)
- target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"')
+ target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"')
target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
if not target.debug:
target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')
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/')
target.command(f'cp -r {target.directory}/share/libdcp/tags {appdir}/usr/share/libdcp/')
+ target.command(f'cp {target.directory}/share/libdcp/ratings {appdir}/usr/share/libdcp/')
lib = 'usr/lib/x86_64-linux-gnu'
target.command(f'mkdir -p build/{nice_filename}.AppDir/{lib}/gdk-pixbuf-2.0/2.10.0')
target.command(f'cp -a /{lib}/gdk-pixbuf-2.0 build/{nice_filename}.AppDir/usr/lib/x86_64-linux-gnu/')
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 Combiner', 'dcpomatic2_combiner', version))
+ out.append(make_appimage(target, 'DCP-o-matic Editor', 'dcpomatic2_editor', version))
return out
else:
if target.bits == 32:
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
projects / dcpomatic.git / blobdiff