# -*- mode: python -*-
#
-# Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
#
# This file is part of DCP-o-matic.
#
deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.9'])
deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['unstable'].extend(['python'])
+deb_build_depends['unstable'].extend(['python3'])
deb_depends = dict()
deb_depends_gui = dict()
'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['21.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['21.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',
- 'libicu67',
- 'libnettle8',
- 'libssh-4',
- 'libx264-160',
- 'libcurl4',
- 'libpulse0',
- 'libxerces-c3.2',
- 'libnanomsg5'])
-
deb_depends['21.10'] = copy.deepcopy(deb_depends_base)
deb_depends['21.10'].extend(['libboost-filesystem1.74.0',
'libboost-thread1.74.0',
'libcurl4',
'libpulse0',
'libxerces-c3.2',
- 'libnanomsg5'])
+ 'libnanomsg5',
+ 'libdav1d4'])
deb_depends['9'] = copy.deepcopy(deb_depends_base)
deb_depends['9'].extend(['libboost-filesystem1.62.0',
'libx264-160',
'libcurl4',
'libxerces-c3.2',
- 'libnanomsg5'])
+ 'libnanomsg5',
+ 'libdav1d4'])
deb_depends_gui['11'] = [ 'libxcb-xfixes0',
'libxcb-shape0',
'libnettle6',
'libx264-155',
'libcurl4',
- 'libxerces-c3.2'])
+ 'libxerces-c3.2',
+ 'libdav1d4'])
def can_build_disk(target):
# We can build dcpomatic2_disk on platforms that have Boost process and can build the lwext4
def make_spec(filename, version, target, options, requires=None):
"""Make a .spec file for a RPM build"""
- tools = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(filename))), "src/tools")
f = open(filename, 'w')
print('Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files', file=f)
print('Name:dcpomatic2', file=f)
print('%{_bindir}/dcpomatic2_openssl', file=f)
print('%{_bindir}/dcpomatic2_combiner', file=f)
print('%{_bindir}/dcpomatic2_verify', file=f)
- if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
+ 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}/applications/dcpomatic2.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_combiner.desktop', file=f)
- if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
+ if can_build_disk(target):
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('', file=f)
print('%post', file=f)
print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
+ print('setcap "cap_dac_override+ep cap_sys_admin+ep" /usr/bin/dcpomatic2_disk_writer', file=f)
print('', file=f)
print('%postun', file=f)
print('if [ $1 -eq 0 ] ; then', file=f)
ffmpeg_options = {}
if target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg-cdist', '107f9af8', ffmpeg_options)]
+ deps = [('ffmpeg-cdist', 'cb2b073d4f88230fca1d1d74e45235f5268fd825', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.1'))
- deps.append(('libsub', 'v1.6.1'))
+ deps.append(('libdcp', 'v1.8.7'))
+ deps.append(('libsub', 'v1.6.7'))
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', '6259cd4'))
+ deps.append(('ffcmp', '10934f1a9cd9770ef0b38da153f9576e77e7e925'))
return deps
target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"')
target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
- if target.debug:
- target.set('CDIST_DEBUG_PACKAGE_FLAG', f'--dbg-package=dcpomatic{suffix}-dbg')
+ if not target.debug:
+ target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')
target.command('dpkg-buildpackage -uc -us')
requires = None
if target.distro == 'mageia':
- requires = "lib64xmlsec1-devel lib64canberra-gtk0"
+ requires = "lib64xmlsec1-devel lib64canberra-gtk0 libcap-utils"
- make_spec('build/platform/linux/dcpomatic2.spec', version, target, options, requires)
- cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir
+ make_spec('dcpomatic2.spec', version, target, options, requires)
+ cmd = 'rpmbuild --define "_topdir %s" -bb dcpomatic2.spec' % topdir
target.command(cmd)
rpms = []
def make_appimage(target, nice_name, internal_name, version):
nice_filename = nice_name.replace(' ', '_')
- os.makedirs('build/%s.AppDir/usr/bin' % nice_filename)
- target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename))
- target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename))
- target.command('cp %s/bin/dcpverify build/%s.AppDir/usr/bin/dcpomatic2_verify' % (target.directory, nice_filename))
- target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename)
- target.command('cp -r %s/share/dcpomatic2 build/%s.AppDir/usr/share/' % (target.directory, nice_filename))
- target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename))
- target.command('cp -r %s/share/libdcp/tags build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename))
+ appdir = f'build/{nice_filename}.AppDir'
+ os.makedirs(f'{appdir}/usr/bin')
+ target.command(f'cp {target.directory}/bin/{internal_name} {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'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/')
+ target.command(f'cp -r {target.directory}/share/libdcp/tags {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/')
+ target.command('apt update')
+ for package in ['libc6', 'libglib2.0-0', 'gnome-settings-daemon-schemas', 'librsvg2-common', 'libgdk-pixbuf2.0-0', 'libpango-1.0-0', 'libpangoft2-1.0-0', 'libpangocairo-1.0-0']:
+ target.command(f'apt download {package}')
+ target.command(f'dpkg-deb -x {package}*.deb {appdir}')
+ target.command(f'glib-compile-schemas {appdir}/usr/share/glib-2.0/schemas')
+ target.command(f'sed -i -e "s|/usr/lib/x86_64-linux-gnu/gdk-pixbuf-.*/.*/loaders/||g" {appdir}/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache')
+ # Stop anything loading from outside the AppImage
+ target.command(f'sed -i -e "s|/usr|/xxx|g" {appdir}/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2')
+
if internal_name == 'dcpomatic2_disk':
- target.command('mkdir -p build/%s.AppDir/usr/share/polkit-1/actions' % nice_filename)
- target.command('cp %s/share/polkit-1/actions/com.dcpomatic.write-drive.policy build/%s.AppDir/usr/share/polkit-1/actions' % (target.directory, nice_filename))
+ target.command(f'mkdir -p {appdir}/usr/share/polkit-1/actions')
+ target.command(f'cp {target.directory}/share/polkit-1/actions/com.dcpomatic.write-drive.policy {appdir}/usr/share/polkit-1/actions')
- with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f:
+ with open(f'{appdir}/AppRun', 'w') as f:
print('#!/bin/bash', file=f)
print('export PATH=$APPDIR/usr/bin:$PATH', file=f)
print('export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS"', file=f)
- print('export LD_LIBRARY_PATH=$APPDIR/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}', file=f)
- print('"$APPDIR"/usr/bin/%s $@' % internal_name, file=f)
- target.command('chmod a+rx build/%s.AppDir/AppRun' % nice_filename)
- with open('build/%s.AppDir/%s.desktop' % (nice_filename, internal_name), 'w') as f:
+ print('export GDK_PIXBUF_MODULEDIR=$(readlink -f "$APPDIR"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/ )', file=f)
+ print('export GDK_PIXBUF_MODULE_FILE=$(readlink -f "$APPDIR"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache )', file=f)
+ print('export LD_LIBRARY_PATH=$GDK_PIXBUF_MODULEDIR:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu', file=f)
+ print(f'"$APPDIR"/usr/bin/{internal_name} $@', file=f)
+ target.command(f'chmod a+rx {appdir}/AppRun')
+ with open(f'{appdir}/{internal_name}.desktop', 'w') as f:
print('[Desktop Entry]', file=f)
print('Type=Application', file=f)
print('Categories=AudioVideo;', file=f)
- print('Name=%s' % nice_name, file=f)
- print('Icon=%s' % internal_name, file=f)
- target.command('cp graphics/linux/256/%s.png build/%s.AppDir' % (internal_name, nice_filename))
- target.command('linuxdeploy-x86_64.AppImage --appdir build/%s.AppDir' % nice_filename)
- target.command('appimagetool-x86_64.AppImage build/%s.AppDir' % nice_filename)
- target.command('mv %s-x86_64.AppImage build/%s-%s-x86_64.AppImage' % (nice_filename, nice_filename, version))
- return os.path.abspath('build/%s-%s-x86_64.AppImage' % (nice_filename, version))
+ print(f'Name={nice_name}', file=f)
+ print(f'Icon={internal_name}', file=f)
+ target.command(f'cp graphics/linux/256/{internal_name}.png {appdir}')
+ target.command(f'linuxdeploy-x86_64.AppImage --appdir {appdir}')
+ target.command(f'appimagetool-x86_64.AppImage {appdir}')
+ target.command(f'mv {nice_filename}-x86_64.AppImage build/{nice_filename}-{version}-x86_64.AppImage')
+ return os.path.abspath(f'build/{nice_filename}-{version}-x86_64.AppImage')
def package(target, version, options):
"""version: DCP-o-matic version string"""